Changeset 3973

Show
Ignore:
Timestamp:
05/08/07 10:18:59 (6 years ago)
Author:
p_lindheimer
Message:

fix more cases where duplicates are checked when adding/deleting extensions if directdid is blank, also fixed corner case where any/any inbound route is edited but a space was inserted in the did or cid

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3971 r3973  
    486486function core_did_edit($old_extension,$old_cidnum, $old_channel, $incoming){ 
    487487 
     488  $old_extension = addslashes(trim($old_extension)); 
     489  $old_cidnum = addslashes(trim($old_cidnum)); 
     490  $old_channel = addslashes(trim($old_channel)); 
     491 
     492  $incoming['extension'] = trim($incoming['extension']); 
     493  $incoming['cidnum'] = trim($incoming['cidnum']); 
     494  $incoming['channel'] = trim($incoming['channel']); 
     495 
    488496  $extension = addslashes($incoming['extension']); 
    489497  $cidnum = addslashes($incoming['cidnum']); 
     498  $channel = addslashes($incoming['channel']); 
    490499 
    491500  // if did or cid changed, then check to make sure that this pair is not already being used. 
    …… 
    11351144  // 
    11361145  $directdid = preg_replace("/[^0-9._XxNnZz\[\]\-]/" ,"", trim($directdid)); 
    1137   $existing=core_did_get($directdid,"",""); 
    1138   $existing_directdid = empty($existing)?core_users_directdid_get($directdid):$existing; 
    1139   if (!empty($existing) || !empty($existing_directdid)) { 
    1140     if (!empty($existing)) { 
    1141       echo "<script>javascript:alert('"._("A route with this DID already exists:")." ".$existing['extension']."')</script>"; 
    1142     } else { 
    1143       echo "<script>javascript:alert('"._("This DID is already associated with extension:")." ".$existing_directdid['extension']." (".$existing_directdid['name'].")')</script>"; 
    1144     } 
    1145     return false; 
     1146  if (trim($directdid) != "") { 
     1147    $existing=core_did_get($directdid,"",""); 
     1148    $existing_directdid = empty($existing)?core_users_directdid_get($directdid):$existing; 
     1149    if (!empty($existing) || !empty($existing_directdid)) { 
     1150      if (!empty($existing)) { 
     1151        echo "<script>javascript:alert('"._("A route with this DID already exists:")." ".$existing['extension']."')</script>"; 
     1152      } else { 
     1153        echo "<script>javascript:alert('"._("This DID is already associated with extension:")." ".$existing_directdid['extension']." (".$existing_directdid['name'].")')</script>"; 
     1154      } 
     1155      return false; 
     1156    } 
    11461157  } 
    11471158   
    …… 
    13231334  $directdid=$vars['directdid']; 
    13241335  $directdid = preg_replace("/[^0-9._XxNnZz\[\]\-]/" ,"", trim($directdid)); 
    1325   if ($directdid != "") { 
     1336  if (trim($directdid) != "") { 
    13261337    $existing=core_did_get($directdid,"",""); 
    13271338    $existing_directdid = empty($existing)?core_users_directdid_get($directdid):$existing;