Changeset 5982

Timestamp:

07/10/08 19:16:26 (4 years ago)

Author:

p_lindheimer

Message:

#2899 create optional feature codes linked to system recordings so user can change them

Files:

• modules/branches/2.5/recordings/functions.inc.php (modified) (6 diffs)
• modules/branches/2.5/recordings/install.php (modified) (2 diffs)
• modules/branches/2.5/recordings/module.xml (modified) (2 diffs)
• modules/branches/2.5/recordings/page.recordings.php (modified) (8 diffs)

modules/branches/2.5/recordings/functions.inc.php

@@ -42 +42 @@
-        }
-      }
+
+      // Now generate the Feature Codes to edit recordings
+      //
+      $recordings = recordings_list();
+      foreach ($recordings as $item) {
+
+        // Get the feature code, and do a sanity check if it is not suppose to be active and delete it
+        //
+        if ($item['fcode'] != 0) {
+          $fcc = new featurecode($modulename, 'edit-recording-'.$item['id']);
+          $fcode = $fcc->getCodeActive();
+          unset($fcc);
+        } else {
+          $fcc = new featurecode('recordings', 'edit-recording-'.$item['id']);
+          $fcc->delete();
+          unset($fcc);  
+          continue; // loop back to foreach
+        }
+
+        if ($fcode != '') {
+          // Do a sanity check, there should be no compound files
+          //
+          if (strpos($item['filename'], '&') === false && trim($item['filename']) != '') {
+            $fcode_pass = (trim($item['fcode_pass']) != '') ? ','.$item['fcode_pass'] : '';
+            $ext->add($appcontext, $fcode, '', new ext_macro('user-callerid'));
+            $ext->add($appcontext, $fcode, '', new ext_wait('2'));
+            $ext->add($appcontext, $fcode, '', new ext_macro('systemrecording', 'docheck,'.$item['filename'].$fcode_pass));
+            //$ext->add($appcontext, $fcode, '', new ext_macro('hangup'));
+          }
+        }
+      }
-    break;
-  }
-      
+
-
-function recordings_get_id($fn) {
@@ -70 +101 @@
-  // somee checking in here for it.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -110 +150 @@
-}
-
-
+, $fcode=0, $fcode_pass=''
-
-  // Update the descriptive fields
-
+
+
-  
-  // Build the file list from _REQUEST
@@ -121 +162 @@
-
-  // Set the file names from the submitted page, sysrec[N]
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  // In _REQUEST there are also various actions (possibly) 
@@ -193 +253 @@
-function recordings_del($id) {
-  $results = sql("DELETE FROM recordings WHERE id = \"$id\"");
+
+  // delete the feature code if it existed
+  $fcc = new featurecode('recordings', 'edit-recording-'.$id);
+  $fcc->delete();
+  unset($fcc);  
-}
-
@@ -198 +263 @@
-  // Strip off any dangling &'s on the end:
-  $filename = rtrim($filename, '&');
-\"$filename\" WHERE id = \"$id\"
+'".addslashes($filename)."' WHERE id = '$id'
-}
-

modules/branches/2.5/recordings/install.php

@@ -4 +4 @@
-global $asterisk_conf;
-global $db;
+
+if (! function_exists("out")) {
+  function out($text) {
+    echo $text."<br />";
+  }
+}
+
+if (! function_exists("outn")) {
+  function outn($text) {
+    echo $text;
+  }
+}
+
-$recordings_astsnd_path = isset($asterisk_conf['astvarlibdir'])?$asterisk_conf['astvarlibdir']:'/var/lib/asterisk';
-$recordings_astsnd_path .= "/sounds/";
@@ -78 +91 @@
-  }
- }
+
+  // Version 2.5 upgrade
+  outn(_("checking for fcode field.."));
+  $sql = "SELECT `fcode` FROM recordings";
+  $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+  if(DB::IsError($check)) {
+    // add new field
+    $sql = "ALTER TABLE recordings ADD `fcode` TINYINT( 1 ) DEFAULT 0 ;";
+    $result = $db->query($sql);
+    if(DB::IsError($result)) {
+      die_freepbx($result->getDebugInfo());
+    }
+    out(_("OK"));
+  } else {
+    out(_("already exists"));
+  }
+  outn(_("checking for fcode_pass field.."));
+  $sql = "SELECT `fcode_pass` FROM recordings";
+  $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+  if(DB::IsError($check)) {
+    // add new field
+    $sql = "ALTER TABLE recordings ADD `fcode_pass` VARCHAR( 20 ) NULL ;";
+    $result = $db->query($sql);
+    if(DB::IsError($result)) {
+      die_freepbx($result->getDebugInfo());
+    }
+    out(_("OK"));
+  } else {
+    out(_("already exists"));
+  }
-?>

modules/branches/2.5/recordings/module.xml

@@ -2 +2 @@
-  <rawname>recordings</rawname>
-  <name>Recordings</name>
-6.2
+7
-  <candisable>no</candisable>
-  <canuninstall>no</canuninstall>
@@ -9 +9 @@
-  <description>Creates and manages system recordings, used by many other modules (eg, IVR).</description>
-  <changelog>
+    *3.3.7.0* Version 2.5
-    *3.3.6.2* #2604, #2843 fix mal-formed html tags, Russian Translation
-    *3.3.6.1* #2591, enhance code so bad directory copy errors are reported

modules/branches/2.5/recordings/page.recordings.php

@@ -22 +22 @@
-$sysrec = isset($_REQUEST['sysrec'])?$_REQUEST['sysrec']:'';
-$suffix = isset($_REQUEST['suffix']) && trim($_REQUEST['suffix'] != "") ? $_REQUEST['suffix'] : 'wav';
+
+$fcode  = isset($_REQUEST['fcode']) && $_REQUEST['fcode'] != '' ? 1 : 0;
+$fcode_pass = isset($_REQUEST['fcode_pass'])?$_REQUEST['fcode_pass']:'';
+
+$fcbase = '*29';
+$default_pos = 0;
-
-$astsnd = isset($asterisk_conf['astvarlibdir'])?$asterisk_conf['astvarlibdir']:'/var/lib/asterisk';
@@ -128 +134 @@
-    
-  case "edited":
-
+, $fcode, $fcode_pass
-    recording_sidebar($id, $usersnum);
-    recording_editpage($id, $usersnum);
@@ -224 +230 @@
-}
-
-
-
+
+
+
+
+
+
-  <div class="content">
-  <h2><?php echo _("System Recordings")?></h2>
@@ -240 +250 @@
-  $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/sound_delete.png"/>&nbsp;'.$tlabel.'</span>';
-  echo "<a href=".$delURL.">".$label."</a>";
-
+&nbsp;
-  echo _("Note, does not delete file from computer");
-  echo ")</i>";
@@ -259 +269 @@
-        <td>&nbsp;<textarea name="notes" rows="3" cols="40" tabindex="<?php echo ++$tabindex;?>"><?php echo $this_recording['description'] ?></textarea></td>
-  </tr>
-
-
-
-
-
-
+
+
+
+
-  $fn = $rec['filename'];
-  $files = explode('&', $fn);
-  $counter = 0;
-  $arraymax = count($files)-1;
+  $sndfile_html = "";
+  foreach ($files as $item) {
+    $sndfile_html .=  recordings_display_sndfile($item, $counter, $arraymax, $recordings_astsnd_path, $rec['fcode']);
+    $counter++;
+  } 
+  $sndfile_html .=  recordings_display_sndfile('', $counter, $arraymax, $recordings_astsnd_path, $rec['fcode']);
+  if ($arraymax == 0 && isset($files[0]) && substr($files[0],0,7) == 'custom/') {
+?>
+  <tr>
+    <td><a class="info" href="#"><?php echo _("Link to Feature Code")?><span><?php echo _("Check this box to create an options feature code that will allow this recording to be changed directly.")?></span></a>:
+    </td>
+    <td>
+  <input type='checkbox' tabindex="<?php echo ++$tabindex;?>"name='fcode' id="fcode" <?php if ($rec['fcode']=="1") { echo 'CHECKED'; }?> OnClick="resetDefaultSound();"; return true;'><?php echo sprintf(_("Optional Feature Code %s"),$fcbase.$id)?>
+    </td>
+  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Feature Code Password");?><span><?php echo _("Optional password to protect access to this feature code which allows a user to re-record it.");?></span></a></td>
+    <td><input type="text" name="fcode_pass" id="fcode_pass" value="<?php echo $rec['fcode_pass'] ?>" tabindex="<?php echo ++$tabindex;?>"></td>
+  </tr>
+<?php 
+  } else {
+?>
+  <tr>
+    <td colspan="2"><a class="info" href="#"><?php echo _("Direct Access Feature Code Not Available")?><span><?php echo _("Direct Access Feature Codes for recordings are not available for built in system recordings or compound recordings made of multipe individual ones.")?></span></a>:
+    </td>
+  </tr>
+<?php 
+  }
+?>
+
+  <tr><td colspan="2"><hr /></td></tr>
+  </table>
+  <?php echo _("Files");?>:<br />
+  <table>
+  <?php 
-  // globals seem to busted in PHP5 define here for now
-  $recordings_astsnd_path = isset($asterisk_conf['astvarlibdir'])?$asterisk_conf['astvarlibdir']:'/var/lib/asterisk';
-  $recordings_astsnd_path .= "/sounds/";
-
-
-
-
-
-
+
+
+
-  ?>
-  </table>
@@ -283 +324 @@
-  <?php recordings_popup_jscript(); ?>  
-  <?php recordings_form_jscript(); ?> 
+  <script language="javascript">
+  <!-- Begin
+  var sysrec0_idx;
+  function initPage() {
+    sysrec0_idx = document.getElementById("sysrec0").selectedIndex;
+    alert('Got here with sysrec0_idx as:'.sysrec0_idx);
+  }
+  function resetDefaultSound() {
+    if (document.getElementById('fcode').checked) {
+      document.getElementById('sysrec0').selectedIndex=<?php echo $default_pos ?>;
+      document.getElementById('sysrec1').selectedIndex=0;
+
+      document.getElementById('sysrec0').disabled=true;
+      document.getElementById('sysrec1').disabled=true;
+      document.getElementById('play0').style.visibility='hidden';
+      document.getElementById('play1').style.visibility='hidden';
+      document.getElementById('down0').style.visibility='hidden';
+      document.getElementById('up1').style.visibility='hidden';
+      document.getElementById('del0').style.visibility='hidden';
+      document.getElementById('del1').style.visibility='hidden';
+    } else {
+      document.getElementById('sysrec0').disabled=false;
+      document.getElementById('sysrec1').disabled=false;
+      document.getElementById('play0').style.visibility='visible';
+      document.getElementById('play1').style.visibility='visible';
+      document.getElementById('down0').style.visibility='visible';
+      document.getElementById('up1').style.visibility='visible';
+      document.getElementById('del0').style.visibility='visible';
+      document.getElementById('del1').style.visibility='visible';
+    }
+  }
+  // End -->
+  </script>
-  </form>
-  </div>
@@ -386 +460 @@
-}
-
-
+
+
-  global $amp_conf;
+
+  $disabled_state = $fcode == 0 ? "" : "disabled='true' ";
+  $hidden_state = $fcode == 0 ? "" : "style='visibility:hidden' ";
+
+  $html_text = "";
-  // Note that when using this, it needs a <table> definition around it.
-  $astsnd = isset($asterisk_conf['astvarlibdir'])?$asterisk_conf['astvarlibdir']:'/var/lib/asterisk';
-  $astsnd .= "/sounds/";
-  $sysrecs = recordings_readdir($astsnd, strlen($astsnd)+1);
-
-
+
+
+
-  foreach ($sysrecs as $sr) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  $audio=$astpath;
-
@@ -405 +490 @@
-  $recurl="modules/recordings/popup.php?cryptpass=$REC_CRYPT_PASSWORD&recording=$audio";
-
-echo "<a href='#' type='submit' onClick=\"javascript:popUp('$recurl',document.prompt.sysrec$count); return false;\" input='foo'  
-        echo
-        echo
+$html_txt .=  "<a href='#' $hidden_state type='submit' id='play$count' onClick=\"javascript:popUp('$recurl',document.prompt.sysrec$count); return false;\" input='foo'
+ $html_txt .= 
+ $html_txt .= 
-
-  if ($count==0) {
-print
+$html_txt .= 
-  } else {
-echo
-echo '<td><input name="up'.$count.'" width=10 height=20 border=5  title="Move Up" type="image" src="images/scrollup.gif"  value="'._("Move Up").'"/>'
-print
+$html_txt .= 
+$html_txt .=  "<td><input $hidden_state name='up$count' id='up$count' width=10 height=20 border=5  title='Move Up' type='image' src='images/scrollup.gif'  value='"._("Move Up")."'>"
+$html_txt .= 
-  } if ($count > $max) {
-print
+$html_txt .= 
-  } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+