Changeset 4692

Timestamp:

08/05/07 00:09:12 (6 years ago)

Author:

p_lindheimer

Message:

#2049 - allow leading 0s in speeddial. Previous behavior also had bug that a speeddial of 0 would get stored as blank. This fix will render any existing speeddials of 0 un-operational. (if someone really likes this functionality, they can write a conversion routine in the install script for those cases

Files:

• modules/branches/2.3/speeddial/functions.inc.php (modified) (6 diffs)
• modules/branches/2.3/speeddial/module.xml (modified) (1 diff)

modules/branches/2.3/speeddial/functions.inc.php

@@ -23 +23 @@
-      }
-
-      // [macro-speeddial-clean]
-      // clean the 0's off of the variable named passed in ARG1
-      $ext->add('macro-speeddial-clean', 's', '', new ext_noop('Cleaing (stripping leading 0s from ${${ARG1}}) in var ${ARG1}'));
-      // while ( substr($$arg1,0,1) = '0') {
-      $ext->add('macro-speeddial-clean', 's', 'start', new ext_gotoif('$[${${ARG1}:0:1}=0]','strip','clean'));
-      //   $$arg1 = substr($$arg1,1);
-      $ext->add('macro-speeddial-clean', 's', 'strip', new ext_set('${ARG1}','${${ARG1}:1}'));
-      // }
-      $ext->add('macro-speeddial-clean', 's', '', new ext_goto('start'));
-      $ext->add('macro-speeddial-clean', 's', 'clean', new ext_noop('${ARG1} cleaned to ${${ARG1}}'));
-      
-      
-      // [macro-speeddial-lookup]
-      // arg1 is speed dial location,  arg2 (optional) is user caller ID
@@ -53 +41 @@
-        $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_macro('user-callerid',''));
-        $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_set('SPEEDDIALLOCATION','${EXTEN:'.(strlen($callcode)).'}'));
-        $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_macro('speeddial-clean','SPEEDDIALLOCATION'));
-        $ext->add('app-speeddial', '_'.$callcode.'.', 'lookup', new ext_macro('speeddial-lookup','${SPEEDDIALLOCATION},${AMPUSER}'));
-        $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_gotoif('$["${SPEEDDIALNUMBER}"=""]','failed'));
@@ -72 +59 @@
-      // "enter speed dial location number"
-      $ext->add('app-speeddial-set', 's', 'setloc', new ext_read('newlocation','speed-enterlocation'));
-      $ext->add('app-speeddial-set', 's', '', new ext_macro('speeddial-clean','newlocation'));
-      $ext->add('app-speeddial-set', 's', 'lookup', new ext_macro('speeddial-lookup','${newlocation},${AMPUSER}'));
-      $ext->add('app-speeddial-set', 's', 'lookup', new ext_gotoif('$["${SPEEDDIALNUMBER}"!=""]', 'conflicts'));
@@ -83 +69 @@
-      // "speed dial location "
-      $ext->add('app-speeddial-set', 's', '', new ext_playback('speed-dial'));
-number
+digits
-      // "is set to "
-      $ext->add('app-speeddial-set', 's', '', new ext_playback('is-set-to'));
@@ -93 +79 @@
-      // "speed dial location"
-      $ext->add('app-speeddial-set', 's', 'conflicts', new ext_playback('speed-dial'));
-number
+digits
-      // "is already set."
-      $ext->add('app-speeddial-set', 's', '', new ext_playback('is-in-use'));
@@ -101 +87 @@
-      // "speed dial location"
-      $ext->add('app-speeddial-set', '1', '', new ext_playback('speed-dial'));
-number
+digits
-      // "is set to "
-      $ext->add('app-speeddial-set', '1', '', new ext_playback('is-set-to'));

modules/branches/2.3/speeddial/module.xml

@@ -2 +2 @@
-  <rawname>speeddial</rawname>
-  <name>Speed dial functions</name>
-3
+4
-  <changelog>
+  *1.0.4* #2049 remove use of speedial-clean, allow leading 0s
-  *1.0.3* changed ${CALLERID(number)} to ${AMPUSER} to accomodate CID number masquerading
-  *1.0.2* No comment