Changeset 5751

Show
Ignore:
Timestamp:
04/25/08 14:06:50 (2 months ago)
Author:
p_lindheimer
Message:

Merged revisions 5750 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5750 | p_lindheimer | 2008-04-25 14:05:16 -0700 (Fri, 25 Apr 2008) | 1 line


#2809 get proper outbound cid from user if not entered with brackets

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/branches/2.4

    • Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748 to /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750
  • freepbx/branches/2.4/amp_conf/htdocs/recordings/includes/login.php

    r4993 r5751  
    358358    if ($response) { 
    359359     
    360                 $posLeft  = strpos( $response, "<")+strlen("<"); 
    361                 $posRight = strpos( $response, ">", $posLeft); 
    362                 $ret = substr( $response,$posLeft,$posRight-$posLeft); 
     360                if (!strpos( $response, "<")) { 
     361                        $ret = trim($response); 
     362                } else { 
     363                        $posLeft  = strpos( $response, "<")+strlen("<"); 
     364                        $posRight = strpos( $response, ">", $posLeft); 
     365                        $ret = substr( $response,$posLeft,$posRight-$posLeft); 
     366                } 
    363367    } 
    364368    return $ret; 
Donate



Support
Download
Develop
Forums
News
Documentation
Paid Support
About

Paid Ads