Changeset 3972

Show
Ignore:
Timestamp:
05/08/07 09:20:31 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 3971 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.2

........

r3971 | p_lindheimer | 2007-05-08 06:18:50 -0700 (Tue, 08 May 2007) | 1 line


don't check for duplicates if directdid is set to blank

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-3724,3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743-3745,3747,3752-3753,3755-3793,3797-3958,3966,3968 to /freepbx/branches/2.2:1-3724,3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743-3745,3747,3752-3753,3755-3793,3797-3958,3966,3968,3971
  • freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php

    r3969 r3972  
    14311431  $directdid=$vars['directdid']; 
    14321432  $directdid = preg_replace("/[^0-9._XxNnZz\[\]\-]/" ,"", trim($directdid)); 
    1433   $existing=core_did_get($directdid,"",""); 
    1434   $existing_directdid = empty($existing)?core_users_directdid_get($directdid):$existing; 
    1435   if (!empty($existing) || !empty($existing_directdid)) { 
    1436     if (!empty($existing)) { 
    1437       echo "<script>javascript:alert('"._("A route with this DID already exists:")." ".$existing['extension']."')</script>"; 
    1438     } else { 
    1439       echo "<script>javascript:alert('"._("This DID is already associated with extension:")." ".$existing_directdid['extension']." (".$existing_directdid['name'].")')</script>"; 
    1440     } 
    1441     return false; 
     1433  if ($directdid != "") { 
     1434    $existing=core_did_get($directdid,"",""); 
     1435    $existing_directdid = empty($existing)?core_users_directdid_get($directdid):$existing; 
     1436    if (!empty($existing) || !empty($existing_directdid)) { 
     1437      if (!empty($existing)) { 
     1438        echo "<script>javascript:alert('"._("A route with this DID already exists:")." ".$existing['extension']."')</script>"; 
     1439      } else { 
     1440        echo "<script>javascript:alert('"._("This DID is already associated with extension:")." ".$existing_directdid['extension']." (".$existing_directdid['name'].")')</script>"; 
     1441      } 
     1442      return false; 
     1443    } 
    14421444  } 
    14431445