Changeset 7866

Timestamp:

06/23/09 15:23:02 (3 years ago)

Author:

p_lindheimer

Message:

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

........

r7812 | mickecarlsson | 2009-06-10 14:39:39 -0700 (Wed, 10 Jun 2009) | 1 line

Closes #3713 adds Russian language to weakpasswords. Thank you ded

........

r7854 | fskrotzki | 2009-06-20 19:53:20 -0700 (Sat, 20 Jun 2009) | 1 line

Fixes #3732 by removing the system context of zonemessages from the selection list

........

r7858 | p_lindheimer | 2009-06-23 10:15:37 -0700 (Tue, 23 Jun 2009) | 1 line

fixes #3734 set FORWARD_CONTEXT before paging to block client side CF

........

Files:

• modules/branches/2.6 (modified) (1 prop)
• modules/branches/2.6/ivr/module.xml (modified) (2 diffs)
• modules/branches/2.6/ivr/page.ivr.php (modified) (1 diff)
• modules/branches/2.6/weakpasswords/i18n/ru_RU (copied) (copied from modules/branches/2.5/weakpasswords/i18n/ru_RU)
• modules/branches/2.6/weakpasswords/i18n/ru_RU/LC_MESSAGES (copied) (copied from modules/branches/2.5/weakpasswords/i18n/ru_RU/LC_MESSAGES)

modules/branches/2.6/ivr/module.xml

@@ -2 +2 @@
-  <rawname>ivr</rawname>
-  <name>IVR</name>
-0
+1
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.6.0.1* #3732
-    *2.6.0.0* #3384, add hook support
-    *2.5.20.5* localization string enclosures

modules/branches/2.6/ivr/page.ivr.php

@@ -207 +207 @@
-          $vmcontexts = array_keys($vm_results);
-          foreach ($vmcontexts as $vmc) {
-$vmc != 'general') && ($vmc != 'zonemessages) 
+($vmc != 'general') && ($vmc != 'zonemessages')) {
-              echo '<option value="'.$vmc.'"'.($vmc == $ivr_details['dircontext'] ? ' SELECTED' : '').'>'.$vmc."</option>\n";
-
+
+
-          ?>
-        </select>