Changeset 6832

Timestamp:

09/22/08 07:09:56 (2 years ago)

Author:

sasargen

Message:

manual merge of ARI fixes up to r6831 from 2.5 branch to ari_changes branch

Files:

• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/bootstrap.php (modified) (2 diffs)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/display.php (modified) (1 diff)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/login.php (modified) (1 diff)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/main.conf.php (modified) (4 diffs)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/zh_TW (deleted)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/misc/audio.php (modified) (1 diff)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/modules/callmonitor.module (modified) (13 diffs)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/modules/followme.module (modified) (2 diffs)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/modules/voicemail.module (modified) (15 diffs)
• freepbx/branches/ari_changes/amp_conf/htdocs/recordings/version.php (modified) (1 diff)

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/bootstrap.php

@@ -98 +98 @@
- */
-function getFiles($path,$filter,$recursive_max,$recursive_count) {
+        global $SETTINGS_MAX_FILES;
+        $SETTINGS_MAX_FILES = isset($SETTINGS_MAX_FILES) ? $SETTINGS_MAX_FILES : 3000;
-
-  $files = array();
@@ -110 +112 @@
-
-        $fileCount++;
-3000
+$SETTINGS_MAX_FILES
-          $_SESSION['ari_error'] 
-            .= _("To many files in $msg_path Not all files processed") . "<br>";

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/display.php

@@ -171 +171 @@
-  function displayNavigationBlock($m,$q,$url_opts,$start,$span,$total) {
-
-$start=='' ? 0 : $start 
-$span=='' ? 15 : $span 
+($start=='' || !ctype_digit($start)) ? 0 : $start
+($span=='' || !ctype_digit($span)) ? 15 : $span
-
-    $total_pages = ceil($total/$span);

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/login.php

@@ -336 +336 @@
-        $_SESSION['ari_user']['default_page'] = $default_page;
-
-
-
+
+
+
+
+
-      } 
-    }

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/includes/main.conf.php

@@ -68 +68 @@
-
-#
-
+ - change defaults to prevent unauthorized access to call recordings
-#
-$ARI_ADMIN_USERNAME = "admin";
@@ -81 +81 @@
-# Authentication password to unlock cookie password
-#   This must be all continuous and only letters and numbers
+#   Change this password to prevent unauthorized access to cookie contents
-#
-$ARI_CRYPT_PASSWORD = "z1Mc6KRxA7Nw90dGjY5qLXhtrPgJOfeCaUmHvQT3yW8nDsI2VkEpiS4blFoBuZ";
@@ -263 +264 @@
-$ASTERISK_PROTOCOLS['sip']['config_files'] = "/etc/asterisk/sip.conf;/etc/asterisk/sip_additional.conf";
-$ASTERISK_PROTOCOLS['zap']['table'] = "zap";
-
+;/etc/asterisk/chan_dahdi.conf;/etc/asterisk/chan_dahdi_additional.conf
-
-# Settings for Follow-Me Select Boxes in seconds
@@ -326 +327 @@
-$SETTINGS_ALLOW_PHONE_SETTINGS = 1;
-
-
+
+
+
+
+
-
-?>

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/misc/audio.php

@@ -7 +7 @@
-
-
-
-
+
-
-  chdir("..");
-  include_once("./includes/bootstrap.php");
-
- global $ARI_CRYPT_PASSWORD
+      $path = $_SESSION['ari_user']['recfiles'][$_GET['recindex']]
-
-  $crypt = new Crypt();
-
-  $path = $crypt->decrypt($_GET['recording'],$ARI_CRYPT_PASSWORD);
-
-  // strip ".." from path for security
-  $path = preg_replace('/\.\./','',$path);
-  
-  // See if the file exists
-  if (!is_file($path)) { die("<b>404 File not found!</b>"); }

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/modules/callmonitor.module

@@ -60 +60 @@
-    $files = array();
-    foreach($_REQUEST as $key => $value) {
-
-value
+ && isset($_SESSION['ari_user']['recfiles'][$value])
+_SESSION['ari_user']['recfiles'][$value]
-      }
-    }
-
-    if ($a=='delete') {
-
-
+
+
+
+
+
+
+
+
-
-    if ($a=='ignore') {
@@ -100 +106 @@
-    global $CALLMONITOR_ALLOW_DELETE;
-    global $AJAX_PAGE_REFRESH_ENABLE;
-    global $ARI_CRYPT_PASSWORD;
-
-    $display = new DisplaySearch();
-    $crypt = new Crypt();
-
-    // get the search string
@@ -115 +119 @@
-    $duration_filter = getArgument($args,'duration_filter');
-
-$start==''
-$span==''
+($start=='' || !ctype_digit($start))
+($span=='' || !ctype_digit($span))
-    $order = $order=='' ? 'calldate' : $order;
-$sort=='' ? 'desc' : $sort
+($sort=='' || strtolower($sort) == 'desc') ? 'desc' : 'asc'
-
-    $displayname = $_SESSION['ari_user']['displayname'];
@@ -138 +142 @@
-    // build controls
-    if ($CALLMONITOR_ALLOW_DELETE) {
+      if (count($recordings) > 0) {
+        $controls .= "<button ";
+      }
+      else {
+        $controls .= "<button disabled='disabled' ";
+      }
-      $controls .= "
-<button 
+
-        " . _("delete") . "
-        </button>
@@ -204 +214 @@
-
-    // table body
-
-
+
+
+
+
+
-
-      // recording file
-      $recording = $recordings[$value['uniqueid'] . $value['calldate']];
-      $fileCrypt = $crypt->encrypt($recording,$ARI_CRYPT_PASSWORD);
-      $recordingCrypt = urlencode($fileCrypt);
-
-      // date and time
@@ -217 +228 @@
-      $time = $buf[1];
-
-      // recording delete checkbox
-      if ($CALLMONITOR_ALLOW_DELETE) {
-        $recording_delete_checkbox = "<td class='checkbox'><input type=checkbox name='selected" . ++$i . "' value=" . $fileCrypt . "></td>";
-      }
-
-      $recordingLink = '';
-      $downloadLink = '';
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      }
-      $playbackRow++;
@@ -273 +287 @@
-      $ret .= "
-        <form  name='callmonitor_form' action='" . $_SESSION['ARI_ROOT'] . "' method='GET'>
-       
+        
-          <input type=hidden name=m value=" . $m . ">   
-          <input type=hidden name=f value=recAction>
@@ -306 +320 @@
-        newRow = cmTable.insertRow(row_num);
-        newRow.id = playbackId;
-        
+       
-        cell_left.colSpan = 9;
-        cell_left.innerHTML = playback_src;
@@ -407 +421 @@
-    }
-
-
+if (is_array($data)) 
-
-      $recording='';
@@ -551 +565 @@
-  function deleteRecData($files) {
-
-
-
-
-
-
-
+
-      if (is_writable($file)) {
-        unlink($file);
@@ -573 +582 @@
-  function getSearchText($q,$duration_filter) {
-
+    $duration_filter = ctype_digit($duration_filter) ? $duration_filter : 0;
+
-    // search text
-    if ($q!='*' && $q!=NULL) {
+
+      $dbh = $_SESSION['dbh_cdr'];
-      $searchText .= "WHERE ";
-      $tok = strtok($q," \n\t");
+      $tok = $dbh->escapeSimple($tok);
-      while ($tok) {
-        $searchText .= " (calldate regexp '" . $tok . "'
@@ -590 +604 @@
-                       )";
-        $tok = strtok(" \n\t");
+        $tok = $dbh->escapeSimple($tok);
-        if ($tok) {
-          $searchText .= " AND";
@@ -684 +699 @@
-
-    $dbh = $_SESSION['dbh_cdr'];
+    $order = $dbh->escapeSimple($order);
-    $sql = "SELECT *
-            FROM " . $ASTERISKCDR_DBTABLE . " 

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/modules/followme.module

@@ -655 +655 @@
-
-        if (isset($_SESSION['dbh_asterisk'])) {
+          $db = $_SESSION['dbh_asterisk'];
-
-          //format for SQL database
@@ -660 +661 @@
-
-          $sql = "UPDATE findmefollow SET grptime = '" . $follow_me_listring_time . "', grplist = '".
-str_replace("'", "''", 
+$db->escapeSimple(
-                   "', needsconf = '" . $follow_me_confirm . "' WHERE grpnum = $exten LIMIT 1";
-          $results = $_SESSION['dbh_asterisk']->query($sql);

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/modules/voicemail.module

@@ -11 +11 @@
-class Voicemail {
-  var $callme_num = "";
+
-  /*
-   * rank (for prioritizing modules)
@@ -28 +29 @@
-    if (empty($this->callme_num)) {
-        $this->callme_num = $extension;         // callme_num defaults to user's extension.
+        callme_setnum($extension, $extension);
-    }
-  }
@@ -154 +156 @@
-    $files = array();
-    foreach($_REQUEST as $key => $value) {
-
-value
+ && isset($_SESSION['ari_user']['recfiles'][$value])
+_SESSION['ari_user']['recfiles'][$value]
-      }
-    }
-
-    if ($a=='delete') {
-
+
+
+
+
+
+
+
-    }
-    else if ($a=='move_to') {
@@ -168 +176 @@
-          = _("A folder must be selected before the message can be moved.");
-      }
-
+if (count($files) > 0) 
-        $context = $_SESSION['ari_user']['context'];
-        $extension = $_SESSION['ari_user']['extension'];
-        $this->moveVoicemailData($files, $context, $extension, $folder_rx);
+      }
+      else {
+        $_SESSION['ari_error'] 
+          = _("One or more messages must be selected before clicking move_to.");        
-      }
-    } 
@@ -182 +194 @@
-          = _("An extension must be selected before the message can be forwarded.");
-      }
-
+if (count($files) > 0) 
-        $folder_rx = $ASTERISK_VOICEMAIL_FOLDERS[0]['folder'];
-        $this->moveVoicemailData($files, $context_rx, $extension_rx, $folder_rx, false);
+      }
+      else {
+        $_SESSION['ari_error'] 
+          = _("One or more messages must be selected before clicking forward_to.");        
-      }
-    }
@@ -213 +229 @@
-    global $ASTERISK_VOICEMAIL_FOLDERS;
-    global $AJAX_PAGE_REFRESH_ENABLE;
-    global $ARI_CRYPT_PASSWORD;
-
-    $voicemail_audio_format = $_COOKIE['ari_voicemail_audio_format'];
-
-    $display = new DisplaySearch();
-    $crypt = new Crypt();
-
-    // args
@@ -392 +406 @@
-    $download_header .= "<th>" . _("Download"). "</th>";
-    // table body
+    unset($_SESSION['ari_user']['recfiles']);
-    if (isset($data)) {
-      $playbackRow = 2; // Index for where playback control rows used by javascript playback() should appear in the table.  
-                        // First control row would appear below row 1 (hence $playbackRow starts at 2); control rows are inserted/deleted as needed.
-      foreach($data as $file=>$value) {
-
+
-        // Playback links
-        $voicemail_audio_format = $voicemail_audio_format=='' ? '.wav' : $voicemail_audio_format;
@@ -407 +422 @@
-        $duration = $value[duration];
-        if (is_file($recording)) {
-
-
-
-
-
+
+
+
-          $callme_tooltip       = _("Play message at: ") . $this->callme_num;
-          $callmeLink = "<a href='#' onClick=\"javascript:playback('callme', $playbackRow, $callmePage); return false;\"><img src='theme/images/telephone.png' title='" . $callme_tooltip . "'></img></a>";
-ording='" . $recordingCrypt . "'
+index=" . $i . "
-        } 
-        else {
@@ -421 +434 @@
-        }
-
-        $fileCrypt = $crypt->encrypt($file,$ARI_CRYPT_PASSWORD);
-
-        $tableText .= "
-          <tr>
-++$i . "' value=" . $fileCrypt
+$i . "' value=" . $i
-            <td width=68>" . $date . "</td>
-            <td>" . $time . "</td>
@@ -433 +444 @@
-            <td>" . $duration . " sec</td>
-            <td>" . $recordingLink . "&nbsp;&nbsp;" . $callmeLink . "</td>
-       
+        
-          </tr>";
-
@@ -481 +492 @@
-    $ret .= "
-      <form name='voicemail_form' action='" . $_SESSION['ARI_ROOT'] . "' method='GET'>
-       
+        
-        <input type=hidden name=m value=" . $m . ">     
-        <input type=hidden name=f value=msgAction>
@@ -574 +585 @@
-           " . $recording_delete_header . "
-           " . $recording_header . "
-       
+        
-        </tr>
-        " . $tableText . "
@@ -680 +691 @@
-  function deleteVoicemailData($files) {
-
-
-
-
-
-
-
-
-
+
-
-      // get file parts for search
@@ -724 +728 @@
-
-    global $ASTERISK_VOICEMAIL_PATH;
-    global $ARI_CRYPT_PASSWORD;
-
-    $crypt = new Crypt();
-
-    $perm = fileperms($ASTERISK_VOICEMAIL_PATH);
@@ -781 +782 @@
-    }
-
-
-
-
+
-      // add plain path to new array
-      $filesPlain[] = $pathPlain;

freepbx/branches/ari_changes/amp_conf/htdocs/recordings/version.php

@@ -6 +6 @@
- */
-
- with Call Me
+
-
-?>