Changeset 8115

Timestamp:

08/23/09 23:55:25 (2 years ago)

Author:

p_lindheimer

Message:

closes #3581 and closes #3266 weakpassword validation for sip and iax devices

Files:

• modules/branches/2.6/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.6/core/module.xml (modified) (1 diff)

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

@@ -5205 +5205 @@
-    $tmparr = array();
-    $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => 'isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret);
+    $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => '(isEmpty() && !confirm("'.$msgConfirmSecret.'")) || (!isEmpty() && weakSecret())', 'failvalidationmsg' => $msgInvalidSecret);
-    $tmparr['notransfer'] = array('value' => 'yes', 'level' => 1);
-    $tmparr['context'] = array('value' => 'from-internal', 'level' => 1);
@@ -5223 +5224 @@
-    // sip
-    $tmparr = array();
-isEmpty() && !confirm("'.$msgConfirmSecret.'"
+(isEmpty() && !confirm("'.$msgConfirmSecret.'")) || (!isEmpty() && weakSecret()
-    $tmparr['dtmfmode'] = array('value' => 'rfc2833', 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidDTMFMODE );
-    $tmparr['canreinvite'] = array('value' => 'no', 'level' => 1);
@@ -5398 +5399 @@
-          $devoptjs = isset($devoptarr['jsvalidation']) ? $devoptarr['jsvalidation'] : '';
-          $devoptfailmsg = isset($devoptarr['failvalidationmsg']) ? $devoptarr['failvalidationmsg'] : '';
+
+          // We compare the existing secret against what might be in the put to detect changes when validating
+          if ($devopt == "secret") {
+            $currentcomponent->addguielem($section, new gui_hidden($devopname . "_origional", $devoptcurrent), 4);
+          }
-  
-          if ( $devoptarr['level'] == 0 || ($extdisplay && $devoptarr['level'] == 1) ) { // editing to show advanced as well

modules/branches/2.6/core/module.xml

@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
-
+, #3581, #3266
-    *2.6.0beta1.3* trunk tab improvements
-    *2.6.0beta1.2* added more sql escape in devices