Changeset 9549

Timestamp:

04/27/10 07:54:40 (3 years ago)

Author:

mbrevda

Message:

re #4147, closes #4235; add return to ivr gui option

Files:

• modules/branches/2.8/companydirectory/agi-bin/compdir.agi (modified) (1 diff)
• modules/branches/2.8/companydirectory/agi-bin/compdir.lib.php (modified) (5 diffs)
• modules/branches/2.8/companydirectory/functions.inc.php (modified) (4 diffs)
• modules/branches/2.8/companydirectory/install.php (modified) (1 diff)

modules/branches/2.8/companydirectory/agi-bin/compdir.agi

@@ -5 +5 @@
-$loopcounter1=$loopcounter2=0;
-$search=array();
-2);//todo: get variable dynamiclay from dialpaln
+);
-
-$dir->agi->stream_file('dir-welcome');//say hello

modules/branches/2.8/companydirectory/agi-bin/compdir.lib.php

@@ -10 +10 @@
-  //pear::db database object handel
-  var $db;
+  //options of the directory that we are currently working with
+  var $dir;
-  //the current directory that we are working with
-  var $directory;
@@ -16 +18 @@
-  
-  //this function is run by php automaticly when the class is initalized
-
-
+
-    $this->agi=$this->__construct_agi();  
-
+//
-    $this->db=$this->__construct_db();
+    //$this->agivars=$this->__construct_inital_vars();
+    $this->directory=$this->agivars['dir'];
+    $this->dir=$this->__construct_dir_opts();
+    $this->dbug('dir_opts',$this->agivars);
-  }
-  
@@ -40 +45 @@
-      }
-    }
-
+
+
+
+
+
+
+
+
-    $this->agivar=$opts;
-    return $agi;
@@ -47 +59 @@
-  //get ami handel, called by __construct()
-  function __construct_ami(){
-'/var/lib/asterisk/agi-bin
+$this->agi_get_var('ASTAGIDIR').'
-    $ami=new AGI_AsteriskManager();
-    return $ami;
@@ -63 +75 @@
-  }
-  
+  //get options associated with the current dir
+  function __construct_dir_opts(){
+    $sql='SELECT * FROM directory_details WHERE ID = ?';
+    $row=$this->db->getRow($sql,array($this->directory),DB_FETCHMODE_ASSOC);
+    $this->dbug($this->db->last_query);
+    return $row;
+  }
+/*  
+  //get inital variables passed to the agi, called by __construct()
+  function __construct_inital_vars(){
+    array_shift($_SERVER['argv']);
+    foreach($_SERVER['argv'] as $arg){
+      $arg=explode('=',$arg);
+      //remove leading '--'
+      if(substr($arg['0'],0,2) == '--'){$arg['0']=substr($arg['0'],2);}
+      $opts[$arg['0']]=isset($arg['1'])?$arg['1']:null;
+    }
+    return $opts;
+  }
+*/
-  //get a channel varibale  
-  function agi_get_var($var){

modules/branches/2.8/companydirectory/functions.inc.php

@@ -37 +37 @@
-    $currentcomponent->addguielem($section, new gui_selectbox('invalid_recording', $currentcomponent->getoptlist('recordings'), $dir['invalid_recording'], 'Invalid Recording', 'Prompt to be played before sending the caller to an alternate destination due to receiving the maximum amount of invalid/unmatched responses (as determaind by Invalid Retries)', false));
-    $currentcomponent->addguielem($section, new gui_drawselects('invalid_destination', 0, $dir['invalid_destination'], _('Invalid Destination'), _('Destination to send the call to after Invalid Recording is played.'), false));
+    $currentcomponent->addguielem($section, new gui_checkbox('retivr', $dir['retivr'], 'Return to IVR', 'When selected, if the call passed through an anr that had "Return to IVR" selected, the call will be returned there instead of the Invalid destination.',true));
-    $currentcomponent->addguielem($section, new gui_hidden('id', $dir['id']));
-    $currentcomponent->addguielem($section, new gui_hidden('action', 'edit'));
@@ -60 +61 @@
-    global $db,$amp_conf;
-    //get variables for directory_details
-
-
+
+
+
-    foreach($requestvars as $var){
-      $vars[$var]=isset($_REQUEST[$var])?$_REQUEST[$var]:'';
@@ -165 +167 @@
-  $select.='<optgroup label="'._('System Recordings:').'">';
-  
-dbug('$directory_draw_recordings_list',$r);
+
-    $select.='<option value="'.$r['id'].'" '.(($audio==$r['id'])?'SELECTED':'').'>'.$r['displayname'].'</option>';
-  }
@@ -202 +204 @@
-function companydirectory_save_dir_details($vals){
-  global $db;
-
+, ?
-  $foo=$db->query($sql,$vals);
-  if (DB::IsError($foo)){
-    dbug($foo->getDebugInfo());
-  }
+  dbug($db->last_query);
-}
-

modules/branches/2.8/companydirectory/install.php

@@ -31 +31 @@
-    repeat_recording INT,
-    invalid_recording INT,
-
+
+
-)";
-