Changeset 8100

Timestamp:

08/23/09 18:20:12 (4 years ago)

Author:

p_lindheimer

Message:

fixes #3780 undefined variables

Files:

• modules/branches/2.6/findmefollow/functions.inc.php (modified) (1 diff)
• modules/branches/2.6/findmefollow/module.xml (modified) (1 diff)
• modules/branches/2.6/ivr/functions.inc.php (modified) (1 diff)
• modules/branches/2.6/ivr/module.xml (modified) (2 diffs)
• modules/branches/2.6/voicemail/functions.inc.php (modified) (2 diffs)
• modules/branches/2.6/voicemail/module.xml (modified) (2 diffs)

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

@@ -316 +316 @@
-    //
-    $changed=0;
+    if (!isset($results['pre_ring'])) {
+      $results['pre_ring'] = '';
+    }
+    if (!isset($results['grptime'])) {
+      $results['grptime'] = '';
+    }
+    if (!isset($results['grplist'])) {
+      $results['grplist'] = '';
+    }
+    if (!isset($results['needsconf'])) {
+      $results['needsconf'] = '';
+    }
-    if (($astdb_prering != $results['pre_ring']) && ($astdb_prering >= 0)) {
-      $results['pre_ring'] = $astdb_prering;

modules/branches/2.6/findmefollow/module.xml

@@ -2 +2 @@
-  <rawname>findmefollow</rawname>
-  <name>Follow Me</name>
-0
+1
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
-  <changelog>
+    *2.6.0.1* #3780
-    *2.6.0.0* localizations, misc
-    *2.5.1.7* #3274, localization string enclosures

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

@@ -409 +409 @@
-      $dest = $post[$post[$var].$match[1]];
-      $cmd = $post['option'.$match[1]];
-$post['ivr_ret'.$match[1]]
+isset($post['ivr_ret'.$match[1]]) ? $post['ivr_ret'.$match[1]] : ''
-      // Debugging if it all goes pear shaped.
-      // print "I think pushing $cmd does $dest<br>\n";

modules/branches/2.6/ivr/module.xml

@@ -2 +2 @@
-  <rawname>ivr</rawname>
-  <name>IVR</name>
-1
+2
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.6.0.2* #3780
-    *2.6.0.1* #3732
-    *2.6.0.0* #3384, add hook support

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

@@ -798 +798 @@
-    $vmxobj->setMenuOpt("",0,'busy');
-  } else {
+    if (!isset($vmx_option_0_number)) {
+      $vmx_option_0_number = '';
+    }
-    $vmx_option_0_number = preg_replace("/[^0-9]/" ,"", $vmx_option_0_number);
-    $vmxobj->setMenuOpt($vmx_option_0_number,0,'unavail');
@@ -803 +806 @@
-  }
-
-
+isset($vmx_state) && 
-
-    if (isset($vmx_unavail_enabled) && $vmx_unavail_enabled != '') {

modules/branches/2.6/voicemail/module.xml

@@ -2 +2 @@
-  <rawname>voicemail</rawname>
-  <name>Voicemail</name>
-0
+1
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -8 +8 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.6.0.1* #3780
-    *2.6.0.0* #1957, localizations, misc
-    *2.5.1.7* #3698