Changeset 7101

Show
Ignore:
Timestamp:
10/22/08 10:50:11 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7098-7099 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7098 | p_lindheimer | 2008-10-22 08:28:11 -0700 (Wed, 22 Oct 2008) | 1 line


fixes #3311 revert r7001 re #3266 introduces faulty javascript on new extension/device and doesn't work in those cases either

........

r7099 | p_lindheimer | 2008-10-22 08:39:23 -0700 (Wed, 22 Oct 2008) | 1 line


Module Publish Script: core 2.5.1.1

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7080 to /modules/branches/2.5:1-7080,7098-7099

  • modules/branches/2.6/core

    • Property lastpublish changed from 7067 to 7098

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

    r7096 r7101  
    45374537    $msgConfirmSecret = _("You have not entered a Secret for this device, although this is possible it is generally bad practice to not assign a Secret to a device. Are you sure you want to leave the Secret empty?"); 
    45384538    $msgInvalidSecret = _("Please enter a Secret for this device"); 
    4539     $msgSecretSameAsExtension = _("You have set your secret and device/extension to the same value. This can be a serious security vulnerability resulting in a hacker compromising your system to make free phone calls. There are many known instances where this has already occurred"); 
    4540  
     4539     
    45414540    // zap 
    45424541    $tmparr = array(); 
    …… 
    45614560    // iax2 
    45624561    $tmparr = array(); 
    4563     $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => '(' . $_REQUEST['extdisplay'] . ' == theForm.devinfo_secret.value && !confirm("' . $msgSecretSameAsExtension . '")) || isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret); 
     4562    $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => 'isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret); 
    45644563    $tmparr['notransfer'] = array('value' => 'yes', 'level' => 1); 
    45654564    $tmparr['context'] = array('value' => 'from-internal', 'level' => 1); 
    …… 
    45784577    // sip 
    45794578    $tmparr = array(); 
    4580     $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => '(' . $_REQUEST['extdisplay'] . ' == theForm.devinfo_secret.value && !confirm("' . $msgSecretSameAsExtension . '")) || isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret); 
     4579    $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => 'isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret); 
    45814580    $tmparr['dtmfmode'] = array('value' => 'rfc2833', 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidDTMFMODE ); 
    45824581    $tmparr['canreinvite'] = array('value' => 'no', 'level' => 1); 

  • modules/branches/2.6/core/module.xml

    r7068 r7101  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.5.1.0</version> 
     6  <version>2.5.1.1</version> 
    77  <candisable>no</candisable> 
    88  <canuninstall>no</canuninstall> 
    99  <changelog> 
     10    *2.5.1.1* #3311, revert #3266 (r7001) 
    1011    *2.5.1.0* #3304, #3276, #3299 
    1112    *2.5.0.4* #3299 
    …… 
    5758    <wiki type="tool" category="Support" sort="5" href="http://freepbx.org" target="_blank" access="all">FreePBX Support</wiki> 
    5859  </menuitems> 
    59   <location>release/2.5/core-2.5.1.0.tgz</location> 
    60   <md5sum>7b2d584403f6ee1fa96f1518b021ac6e</md5sum> 
     60  <location>release/2.5/core-2.5.1.1.tgz</location> 
     61  <md5sum>ec41a93740f319b773d41a20febf94a9</md5sum> 
    6162</module>