Changeset 3065

Show
Ignore:
Timestamp:
11/13/06 16:20:53 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 3064 via svnmerge from
https://svn.sourceforge.net/svnroot/amportal/freepbx/trunk

........

r3064 | p_lindheimer | 2006-11-13 16:15:18 -0800 (Mon, 13 Nov 2006) | 1 line


fixed #1323 - replacing <> with () so that the internal callerid is not corrupdted. This should be restricted in a javascript as well, but for now ...

........

Files:

Legend:

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

    • Property svnmerge-integrated changed from /freepbx/trunk:1-2993,2995-3033,3039-3040 to /freepbx/trunk:1-2993,2995-3033,3039-3040,3064
  • freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php

    r3045 r3065  
    10941094        // then add directdid to the insert command. 
    10951095        // 
     1096        // Clean replace any <> with () in display name - should have javascript stopping this but ... 
     1097        // 
    10961098        $directdid = preg_replace("/[^0-9._XxNnZz\[\]\-]/" ,"", trim($directdid)); 
     1099        $name = preg_replace(array('/</','/>/'), array('(',')'), trim($name)); 
    10971100         
    10981101        //insert into users table 
     
    23202323                        $currentcomponent->addjsfunc('onsubmit()', "\treturn checkBlankUserPwd();\n", 9); 
    23212324                } 
    2322                 $currentcomponent->addguielem($section, new gui_textbox('name', $name, 'Display Name', 'The caller id name for calls from this user will be set to this name.', '!isCallerID()', $msgInvalidOutboundCID, false)); 
     2325                $currentcomponent->addguielem($section, new gui_textbox('name', $name, 'Display Name', 'The caller id name for calls from this user will be set to this name. Only enter the name, NOT the number.', '!isCallerID()', $msgInvalidOutboundCID, false)); 
    23232326                 
    23242327                $section = 'Extension Options'; 
Donate



Support
Download
Develop
Forums
News
Documentation
Paid Support
About

Paid Ads