Show
Ignore:
Timestamp:
05/18/07 19:36:19 (6 years ago)
Author:
p_lindheimer
Message:

core_sipname_check should not fail if the name is used on the existing extension

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php

    r3975 r3987  
    11481148} 
    11491149 
    1150 function core_sipname_check($sipname) { 
     1150function core_sipname_check($sipname, $extension) { 
    11511151  global $db; 
    11521152  if (!isset($sipname) || trim($sipname)=='') 
    11531153    return true; 
    11541154 
    1155   $sql = "SELECT sipname FROM users WHERE sipname = '$sipname'"; 
     1155  $sql = "SELECT sipname FROM users WHERE sipname = '$sipname' AND extension != '$extension'"; 
    11561156  $results = $db->getRow($sql,DB_FETCHMODE_ASSOC); 
    11571157  if(DB::IsError($results)) { 
    …… 
    12001200 
    12011201  $sipname = preg_replace("/\s/" ,"", trim($sipname)); 
    1202   if (! core_sipname_check($sipname)) { 
     1202  if (! core_sipname_check($sipname, $extension)) { 
    12031203    echo "<script>javascript:alert('"._("This sipname: {$sipname} is already in use")."');</script>"; 
    12041204    return false; 
    …… 
    14561456 
    14571457  //delete and re-add 
    1458   if (core_sipname_check($vars['sipname'])) { 
     1458  if (core_sipname_check($vars['sipname'],$extension)) { 
    14591459    core_users_del($extension); 
    14601460    core_users_add($vars);