Changeset 5575

Show
Ignore:
Timestamp:
01/12/08 10:58:20 (1 year ago)
Author:
p_lindheimer
Message:

#2191 revert patch to send cidname - there have been reports that some providers ignore all CID when this is done or even reject calls, and since it is rare that a provider will even look at cidname in most of the world, it has been chosen to go back to previous behavior. If there is enough feedback that an option to have the name sent out is desired, we can look at adding a conifguration switch that would allow it on a given installation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4/core/functions.inc.php

    r5571 r5575  
    13501350                        $ext->add($context, $exten, '', new ext_gotoif('$["foo${REALCALLERIDNUM}" = "foo"]', 'normcid'));  // if not set to anything, go through normal processing 
    13511351                        $ext->add($context, $exten, '', new ext_set('USEROUTCID', '${REALCALLERIDNUM}')); 
    1352                         $ext->add($context, $exten, '', new ext_set('REALCALLERIDNAME', '${CALLERID(name)}')); 
     1352                        //$ext->add($context, $exten, '', new ext_set('REALCALLERIDNAME', '${CALLERID(name)}')); 
    13531353 
    13541354                        // We now have to make sure the CID is valid. If we find an AMPUSER with the same CID, we assume it is an internal  
    …… 
    13721372                        $ext->add($context, $exten, 'usercid', new ext_gotoif('$["${USEROUTCID:1:2}" = ""]', 'report'));  // check CID override for extension 
    13731373                        $ext->add($context, $exten, '', new ext_set('CALLERID(all)', '${USEROUTCID}')); 
    1374                         $ext->add($context, $exten, '', new ext_gotoif('$["x${CALLERID(name)}"!="xhidden"]', 'checkname', 'hidecid'));  // check CID blocking for extension 
     1374                        //$ext->add($context, $exten, '', new ext_gotoif('$["x${CALLERID(name)}"!="xhidden"]', 'checkname', 'hidecid'));  // check CID blocking for extension 
     1375                        $ext->add($context, $exten, '', new ext_gotoif('$["x${CALLERID(name)}"!="xhidden"]', 'report', 'hidecid'));  // check CID blocking for extension 
    13751376                        $ext->add($context, $exten, 'hidecid', new ext_setcallerpres('prohib_passed_screen'));  // Only works with ISDN (T1/E1/BRI) 
    1376                         $ext->add($context, $exten, 'checkname', new ext_execif('$[ $[ "${CALLERID(number)}" = "${REALCALLERIDNUM}" ] & $[ "${CALLERID(name)}" = "" ] ]', 'Set', 'CALLERID(name)=${REALCALLERIDNAME}')); 
     1377                        //$ext->add($context, $exten, 'checkname', new ext_execif('$[ $[ "${CALLERID(number)}" = "${REALCALLERIDNUM}" ] & $[ "${CALLERID(name)}" = "" ] ]', 'Set', 'CALLERID(name)=${REALCALLERIDNAME}')); 
    13771378                        $ext->add($context, $exten, 'report', new ext_noop('CallerID set to ${CALLERID(all)}'));                         
    13781379