Changeset 3967

Show
Ignore:
Timestamp:
05/07/07 10:20:26 (2 years ago)
Author:
p_lindheimer
Message:

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

........

r3966 | p_lindheimer | 2007-05-07 10:14:07 -0700 (Mon, 07 May 2007) | 1 line


#1933 - re-enable error message when a duplicate did is entered on inbound routing

........

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 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
  • freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php

    r3957 r3967  
    513513                $sql="INSERT INTO incoming (cidnum,extension,destination,faxexten,faxemail,answer,wait,privacyman,alertinfo, channel, ringing, mohclass) values ('$cidnum','$extension','$destination','$faxexten','$faxemail','$answer','$wait','$privacyman','$alertinfo', '$channel', '$ringing', '$mohclass')"; 
    514514                sql($sql); 
     515                return true; 
    515516        } else { 
    516517                echo "<script>javascript:alert('"._("A route for this DID/CID already exists!")."')</script>"; 
     518                return false; 
    517519        } 
    518520} 
  • freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.did.php

    r3254 r3967  
    2525                extract($_REQUEST); 
    2626                //add details to teh 'incoming' table 
    27                 core_did_add($_REQUEST); 
    28                 needreload(); 
    29                 redirect_standard(); 
     27                if (core_did_add($_REQUEST)) { 
     28                        needreload(); 
     29                        redirect_standard(); 
     30                } 
    3031        break; 
    3132        case 'delIncoming': 
Donate



Support
Download
Develop
Forums
News
Documentation
Paid Support
About

Paid Ads