Changeset 5368

Show
Ignore:
Timestamp:
12/08/07 01:12:59 (5 years ago)
Author:
p_lindheimer
Message:

fixed a couple SQL bugs, improved dialplan so you can skip annoucement and messages immeditiately (except if saydigits used)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • contributed_modules/modules/vmblast/functions.inc.php

    r5366 r5368  
    8282          // 
    8383          if ($grp['audio_label'] == -1 || !$recordings_installed) { 
    84             $ext->add($contextname, $grpnum, '', new ext_saydigits($grpnum)); 
     84            $ext->add($contextname, $grpnum, '', new ext_setvar('DIGITS',$grpnum)); 
     85            $ext->add($contextname, $grpnum, '', new ext_goto('digits','vmblast','app-vmblast')); 
    8586          } else { 
    8687            if (!$got_recordings) { 
     
    9394            } 
    9495            if (isset($recording_hash[$grp['audio_label']])) { 
    95               $ext->add($contextname, $grpnum, '', new ext_playback($recording_hash[$grp['audio_label']])); 
     96              $ext->add($contextname, $grpnum, '', new ext_setvar('MSG',$recording_hash[$grp['audio_label']])); 
     97              $ext->add($contextname, $grpnum, '', new ext_goto('msg','vmblast','app-vmblast')); 
    9698            } else { 
    97               $ext->add($contextname, $grpnum, '', new ext_saydigits($grpnum)); 
     99              $ext->add($contextname, $grpnum, '', new ext_setvar('DIGITS',$grpnum)); 
     100              $ext->add($contextname, $grpnum, '', new ext_goto('digits','vmblast','app-vmblast')); 
    98101            } 
    99102          } 
    100           $ext->add($contextname, $grpnum, '', new ext_goto('1','vmblast','app-vmblast')); 
    101103        } 
    102104        $contextname = 'app-vmblast'; 
     105        $ext->add($contextname, 'vmblast', 'digits', new ext_execif('$["${DIGITS}" != ""]','SayDigits','${DIGITS}')); 
     106        $ext->add($contextname, 'vmblast', 'msg', new ext_execif('$["${MSG}" != ""]','Background','${MSG}')); 
    103107        $ext->add($contextname, 'vmblast', '', new ext_background('if-correct-press&digits/1')); 
    104108        $ext->add($contextname, 'vmblast', '', new ext_waitexten('20')); 
     
    135139 
    136140function vmblast_add($grpnum,$grplist,$description,$audio_label= -1, $password = '') { 
    137   $sql = "INSERT INTO vmblast (grpnum, grplist, description, audio_label, password) VALUES (".$grpnum.", '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $description)."', $audio_label, '".str_replace("'","''", $password)."')"; 
     141  $sql = "INSERT INTO vmblast (grpnum, grplist, description, audio_label, password) VALUES (".$grpnum.", '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $description)."', '$audio_label', '".str_replace("'","''", $password)."')"; 
    138142  $results = sql($sql); 
    139143} 
  • contributed_modules/modules/vmblast/module.xml

    r5367 r5368  
    22  <rawname>vmblast</rawname> 
    33  <name>VoiceMail Blasting</name> 
    4   <version>1.1.0</version> 
     4  <version>1.1.1</version> 
    55  <type>setup</type> 
    66  <category>Internal Options &amp; Configuration</category> 
     
    99  </description> 
    1010  <changelog> 
     11    *1.1.1* fixed a couple SQL bugs, improved dialplan so you can skip annoucement and messages immeditiately (except if saydigits used) 
    1112    *1.1.0* add audio label, password protect, fix bug for javascript validation to work, add extension/dest registry support 
    1213    *1.0.2* increase grouplist field to varchar(255) to increase the vmblast list 
  • contributed_modules/modules/vmblast/page.vmblast.php

    r5366 r5368  
    177177            $tresults = recordings_list(); 
    178178            $default = (isset($audio_label) ? $audio_label : -1); 
    179             echo '<option value="">'._("Read Group Number")."</option>"; 
     179            echo '<option value="-1">'._("Read Group Number")."</option>"; 
    180180            if (isset($tresults[0])) { 
    181181              foreach ($tresults as $tresult) {