Changeset 8173

Timestamp:

08/25/09 23:11:15 (4 years ago)

Author:

p_lindheimer

Message:

closes #3585 add ability to choose the on/off recordings played when day/night is toggled

Files:

• modules/branches/2.6/daynight/functions.inc.php (modified) (8 diffs)
• modules/branches/2.6/daynight/module.xml (modified) (2 diffs)
• modules/branches/2.6/daynight/page.daynight.php (modified) (3 diffs)

modules/branches/2.6/daynight/functions.inc.php

@@ -192 +192 @@
-  $passwords = daynight_passwords();
-  $got_code = false;
+
+  $day_recording = daynight_recording('day');
+  $night_recording = daynight_recording('night');
-  
-  $id = "app-daynight-toggle"; // The context to be included
@@ -212 +215 @@
-    }
-    $ext->add($id, $c, '', new ext_setvar('INDEX', $index));  
+    $day_file = "beep&silence/1&day&reception&digits/${index}&activated";
+    $night_file = "beep&silence/1&day&reception&digits/${index}&de-activated";
+    if (function_exists('recordings_get_file')) {
+      if ($day_recording[$index] != 0 ) { $day_file = recordings_get_file ($day_recording[$index]); }
+      if ($night_recording[$index] != 0 ) { $night_file = recordings_get_file ($night_recording[$index]); }
+      }
+    $ext->add($id, $c, '', new ext_setvar('DAYREC', $day_file));  
+    $ext->add($id, $c, '', new ext_setvar('NIGHTREC', $night_file));  
-    $ext->add($id, $c, '', new ext_goto($id.',s,1'));
-  }
@@ -229 +240 @@
-      $ext->add($id, $c, 'hook_day', new ext_playback('beep')); // $cmd,n,Playback(...)
-    } else {
-     $ext->add($id, $c, 'hook_day', new ext_playback('beep&silence/1&day&reception&digits/${INDEX}&enabled
+      $ext->add($id, $c, 'hook_day', new ext_playback('${DAYREC}
-    }
-    $ext->add($id, $c, '', new ext_hangup(''));
@@ -240 +251 @@
-      $ext->add($id, $c, 'hook_night', new ext_playback('beep')); // $cmd,n,Playback(...)
-    } else {
-     $ext->add($id, $c, 'hook_night', new ext_playback('beep&silence/1&beep&silence/1&day&reception&digits/${INDEX}&disabled
+       $ext->add($id, $c, 'hook_night', new ext_playback('${NIGHTREC}
-    }
-    $ext->add($id, $c, '', new ext_hangup(''));
@@ -293 +304 @@
-}
-
+//get the existing daynight recordings
+//$mode is either 'day' or 'night'
+function daynight_recording($mode) {
+  $results = sql("SELECT ext, dest FROM daynight WHERE dmode = '".$mode."_recording_id'","getAll",DB_FETCHMODE_ASSOC);
+  if(is_array($results)){
+    foreach($results as $result){
+      $list[$result['ext']] = $result['dest'];
+    }
+  }
+  if (isset($list)) {
+    return $list;
+  } else { 
+    return array();
+  }
+}
+
-function daynight_edit($post, $id=0) {
-  global $db;
@@ -300 +327 @@
-
-  // Delete all the old dests
-
+,'day_recording_id','night_recording_id'
-
-  $day   = isset($post[$post['goto0'].'0'])?$post[$post['goto0'].'0']:'';
@@ -314 +341 @@
-  $fc_description = isset($post['fc_description']) ? trim($post['fc_description']) : "";
-  sql("INSERT INTO daynight (ext, dmode, dest) VALUES ('$id', 'fc_description', '".$db->escapeSimple($fc_description)."')");
+
+  $day_recording_id = isset($post['day_recording_id']) ? trim($post['day_recording_id']) : "";
+  sql("INSERT INTO daynight (ext, dmode, dest) VALUES ('$id', 'day_recording_id', '$day_recording_id')");
+  $night_recording_id = isset($post['night_recording_id']) ? trim($post['night_recording_id']) : "";
+  sql("INSERT INTO daynight (ext, dmode, dest) VALUES ('$id', 'night_recording_id', '$night_recording_id')");
-
-  $dn = new dayNightObject($id);
@@ -350 +382 @@
-  global $db;
-
-
+,'day_recording_id','night_recording_id'
-  $res = $db->getAll($sql, DB_FETCHMODE_ASSOC);
-  if(DB::IsError($res)) {

modules/branches/2.6/daynight/module.xml

@@ -2 +2 @@
-  <rawname>daynight</rawname>
-  <name>Day Night Mode</name>
-1
+2
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -12 +12 @@
-  </description>
-  <changelog>
+    *2.6.0.2* #3585 custom recordings
-    *2.6.0.1* init tabindex
-    *2.6.0.0* #3650, #3651

modules/branches/2.6/daynight/page.daynight.php

@@ -19 +19 @@
-$password = isset($_REQUEST['password'])?$_REQUEST['password']:'';
-$fc_description = isset($_REQUEST['fc_description'])?$_REQUEST['fc_description']:'';
+$day_recording_id = isset($_POST['day_recording_id']) ? $_POST['day_recording_id'] :  '';
+$night_recording_id = isset($_POST['night_recording_id']) ? $_POST['night_recording_id'] :  '';
-
-isset($_REQUEST['itemid'])?$itemid=mysql_real_escape_string($_REQUEST['itemid']):$itemid='';
@@ -78 +80 @@
-  $fc_description = isset($dests['fc_description'])?$dests['fc_description']:'';
-  $state = isset($dests['state'])?$dests['state']:'DAY';
+  $day_recording_id = isset($dests['day_recording_id'])?$dests['day_recording_id']:'';
+  $night_recording_id = isset($dests['night_recording_id'])?$dests['night_recording_id']:'';
-?>
-  <div class="content">
@@ -173 +177 @@
-    </td>
-  </tr>
+
+<?php if(function_exists('recordings_list')) { //only include if recordings are enabled ?>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Recording for Day Mode")?><span><?php echo _("Message to be played.<br>To add additional recordings use the \"System Recordings\" MENU to the left")?></span></a></td>
+    <td>
+      <select name="day_recording_id"  tabindex="<?php echo ++$tabindex;?>">
+      <?php
+        $tresults = recordings_list();
+        $default = (isset($day_recording_id) ? $day_recording_id : '');
+        echo '<option value="0">' ._("Default") ."</option>\n";
+        if (isset($tresults[0])) {
+          foreach ($tresults as $tresult) {
+            echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+          }
+        }
+      ?>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Recording for Night Mode")?><span><?php echo _("Message to be played.<br>To add additional recordings use the \"System Recordings\" MENU to the left")?></span></a></td>
+    <td>
+      <select name="night_recording_id"  tabindex="<?php echo ++$tabindex;?>">
+      <?php
+        $default = (isset($night_recording_id) ? $night_recording_id : '');
+        echo '<option value="0">' ._("Default") ."</option>\n";
+        if (isset($tresults[0])) {
+          foreach ($tresults as $tresult) {
+            echo '<option value="'.$tresult['id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n";
+          }
+        }
+      ?>
+      </select>
+    </td>
+  </tr>
+
+<?php } ?>
+
-  <tr>
-    <td><a href="#" class="info"><?php echo _("Optional Password")?>:<span><?php echo _('You can optionally include a password to authenticate before toggling the day/night mode. If left blank anyone can use the feature code and it will be un-protected')?></span></a></td>