Changeset 2218

Show
Ignore:
Timestamp:
08/04/06 19:53:54 (7 years ago)
Author:
gregmac
Message:

Speeddial tested and working, hacked-up sounds added

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.2/speeddial/functions.inc.php

    r2212 r2218  
    6464        $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_gotoif('$["${SPEEDDIALNUMBER}"=""]','failed')); 
    6565        $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_dial('Local/${SPEEDDIALNUMBER}@from-internal/n','','')); 
    66         $ext->add('app-speeddial', '_'.$callcode.'.', 'failed', new ext_congestion(), 'lookup',101); 
     66         
     67        $ext->add('app-speeddial', '_'.$callcode.'.', 'failed', new ext_playback('speed-dial-empty'), 'lookup',101); 
     68        $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_congestion()); 
    6769         
    6870      } 
     
    7981      $ext->add('app-speeddial-set', 's', '', new ext_macro('speeddial-clean','newlocation')); 
    8082      $ext->add('app-speeddial-set', 's', 'lookup', new ext_macro('speeddial-lookup','${newlocation},${CALLERID(num)}')); 
     83      $ext->add('app-speeddial-set', 's', 'lookup', new ext_gotoif('$["${SPEEDDIALNUMBER}"!=""]', 'conflicts')); 
    8184       
    8285      // "enter phone number" 
    83       $ext->add('app-speeddial-set', 's', 'setnum', new ext_read('newnum','speed-enternum')); 
     86      $ext->add('app-speeddial-set', 's', 'setnum', new ext_read('newnum','speed-enternumber')); 
    8487       
     88       
     89      $ext->add('app-speeddial-set', 's', 'success', new ext_dbput('AMPUSER/${CALLERID(num)}/speeddials/${newlocation}','${newnum}')); 
    8590      // "speed dial location " 
    86       $ext->add('app-speeddial-set', 's', 'success', new ext_playback('speed-location')); 
     91      $ext->add('app-speeddial-set', 's', '', new ext_playback('speed-dial')); 
    8792      $ext->add('app-speeddial-set', 's', '', new ext_saynumber('${newlocation}')); 
    8893      // "is set to " 
    89       $ext->add('app-speeddial-set', 's', '', new ext_playback('speed-setto')); 
     94      $ext->add('app-speeddial-set', 's', '', new ext_playback('is-set-to')); 
    9095      $ext->add('app-speeddial-set', 's', '', new ext_saydigits('${newnum}')); 
    9196      $ext->add('app-speeddial-set', 's', '', new ext_hangup()); 
     
    9499      // conflicts menu 
    95100      // "speed dial location" 
    96       $ext->add('app-speeddial-set', 's', 'conflicts', new ext_playback('speed-location'), 'lookup',101); 
     101      $ext->add('app-speeddial-set', 's', 'conflicts', new ext_playback('speed-dial')); 
    97102      $ext->add('app-speeddial-set', 's', '', new ext_saynumber('${newlocation}')); 
    98       // "is already set. Press 1 to hear current phone number, 2 to pick a new location, 3 to set a new phone number" 
    99       $ext->add('app-speeddial-set', 's', '', new ext_background('speed-conflictsmenu')); 
     103      // "is already set." 
     104      $ext->add('app-speeddial-set', 's', '', new ext_playback('is-in-use')); 
     105      // "Press 1 to hear current phone number, 2 to pick a new location, 3 to set a new phone number" 
     106      $ext->add('app-speeddial-set', 's', '', new ext_background('press-1&to-listen-to-it&press-2&to-enter-a-diff&location&press-3&to-change&telephone-number')); 
    100107       
    101108      // "speed dial location" 
    102       $ext->add('app-speeddial-set', '1', '', new ext_playback('speed-location')); 
     109      $ext->add('app-speeddial-set', '1', '', new ext_playback('speed-dial')); 
    103110      $ext->add('app-speeddial-set', '1', '', new ext_saynumber('${newlocation}')); 
    104111      // "is set to " 
    105       $ext->add('app-speeddial-set', '1', '', new ext_playback('speed-setto')); 
     112      $ext->add('app-speeddial-set', '1', '', new ext_playback('is-set-to')); 
    106113      $ext->add('app-speeddial-set', '1', '', new ext_saydigits('${SPEEDDIALNUMBER}')); 
    107       $ext->add('app-speeddial-set', '1', '', new ext_goto('conflicts')); 
     114      $ext->add('app-speeddial-set', '1', '', new ext_goto('conflicts','s')); 
    108115       
    109       $ext->add('app-speeddial-set', '2', '', new ext_goto('setloc')); 
     116      $ext->add('app-speeddial-set', '2', '', new ext_goto('setloc','s')); 
    110117       
    111       $ext->add('app-speeddial-set', '3', '', new ext_goto('setnum')); 
     118      $ext->add('app-speeddial-set', '3', '', new ext_goto('setnum','s')); 
    112119       
    113120      $ext->add('app-speeddial-set', 't', '', new ext_congestion()); 
  • modules/branches/2.2/speeddial/module.xml

    r2215 r2218  
    22  <rawname>speeddial</rawname> 
    33  <name>Speed dial functions</name> 
    4   <version>0.1</version> 
     4  <version>1.0</version> 
    55  <type>module</type> 
    66  <category>Basic</category>