Changeset 3270

Show
Ignore:
Timestamp:
12/05/06 13:00:27 (6 years ago)
Author:
p_lindheimer
Message:

#1501 - fix logic and clearify tooltip for Trunk 'Never Override CallerID' setting. THIS WILL BREAK 'WORKING' CONFIGURATIONS - since the logic was working backwards - sorry guys, but didn't want to make having the box checked as default, as that is not the common case

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/astetc/extensions.conf

    r3254 r3270  
    741741; 
    742742exten => s,n,GotoIf($["${KEEPCID}" != "TRUE"]?normcid) ;Set to TRUE if coming from ringgroups, CF, etc. 
    743 exten => s,n,GotoIf($["x${OUTKEEPCID_${ARG1}}"!="xon"]?normcid) 
     743exten => s,n,GotoIf($["x${OUTKEEPCID_${ARG1}}" = "xon"]?normcid) 
    744744exten => s,n,GotoIf($["foo${REALCALLERIDNUM}" = "foo"]?normcid) ;if not set to anything, go through normal processing 
    745745exten => s,n,Set(USEROUTCID=${REALCALLERIDNUM}) 

  • freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.trunks.php

    r3205 r3270  
    325325      <tr> 
    326326        <td> 
    327           <a href="#" class="info"><?php echo _("Never Override CallerID")?><span><br><?php echo _("Some VSP's will drop the call if you try to send an invalid CallerID. Use this to never send a CallerID that you haven't explicitly specified. You will notice this problem if you discover that Follow-Me or RingGroups with external numbers don't work properly.")."<br />"._("It's safe to leave this switched off");?><br /><br /></span></a>: 
     327          <a href="#" class="info"><?php echo _("Never Override CallerID")?><span><br><?php echo _("Some VoIP providers will drop the call if you try to send an invalid CallerID (one you don't 'own.' Use this to never send a CallerID that you haven't explicitly specified in this trunk or in the outbound callerid field of an extension/user. You might notice this problem if you discover that Follow-Me or RingGroups with external numbers don't work properly. Checking this box has the effect of disabling 'foreign' callerids from going out this trunk")."<br />"._("It's safe to leave this switched");?><br /><br /></span></a>: 
    328328        </td><td> 
    329329          <input type="checkbox" name="keepcid" <?php if ($keepcid=="on") {echo "checked";}?>/>