Changeset 13995

Timestamp:

04/24/12 13:45:53 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 13994 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.11

........

r13994 | p_lindheimer | 2012-04-24 10:38:08 -0700 (Tue, 24 Apr 2012) | 1 line

fixes #5788 allow use of remote DB for CDR Reports

........

Files:

• modules/branches/2.10 (modified) (2 props)
• modules/branches/2.10/cdr/page.cdr.php (modified) (6 diffs)
• modules/branches/2.10/ivr/install.php (modified) (2 diffs)
• modules/branches/2.10/recordings/page.recordings.php (modified) (1 diff)

modules/branches/2.10/cdr/page.cdr.php

@@ -45 +45 @@
-$system_monitor_dir = isset($amp_conf['ASTSPOOLDIR'])?$amp_conf['ASTSPOOLDIR']."/monitor":"/var/spool/asterisk/monitor";
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-$h_step = 30;
-?>
@@ -472 +482 @@
-if ( isset($_POST['need_csv']) && $_POST['need_csv'] == 'true' ) {
-  $query = "(SELECT calldate, clid, did, src, dst, dcontext, channel, dstchannel, lastapp, lastdata, duration, billsec, disposition, amaflags, accountcode, uniqueid, userfield FROM $db_name.$db_table_name $where $order $sort LIMIT $result_limit)";
-
+cdr
-  cdr_export_csv($resultcsv); 
-}
@@ -478 +488 @@
-if ( isset($_POST['need_html']) && $_POST['need_html'] == 'true' ) {
-  $query = "SELECT `calldate`, `clid`, `did`, `src`, `dst`, `dcontext`, `channel`, `dstchannel`, `lastapp`, `lastdata`, `duration`, `billsec`, `disposition`, `amaflags`, `accountcode`, `uniqueid`, `userfield`, unix_timestamp(calldate) as `call_timestamp`, `recordingfile` FROM $db_name.$db_table_name $where $order $sort LIMIT $result_limit";
-
+cdr
-}
-if ( isset($results) ) {
@@ -640 +650 @@
-if ( isset($_POST['need_chart']) && $_POST['need_chart'] == 'true' ) {
-  $query2 = "SELECT $group_by_field AS group_by_field, count(*) AS total_calls, sum(duration) AS total_duration FROM $db_name.$db_table_name $where GROUP BY group_by_field ORDER BY group_by_field ASC LIMIT $result_limit";
-
+cdr
-
-  $tot_calls = 0;
@@ -698 +708 @@
-    /* not date time fields */
-    $query3 = "SELECT $group_by_field AS group_by_field, count(*) AS total_calls, unix_timestamp(calldate) AS ts, duration FROM $db_name.$db_table_name $where GROUP BY group_by_field, unix_timestamp(calldate) ORDER BY group_by_field ASC LIMIT $result_limit";
-
+cdr
-    $group_by_str = '';
-    foreach($result3 as $row) {
@@ -724 +734 @@
-    /* data fields */
-    $query3 = "SELECT unix_timestamp(calldate) AS ts, duration FROM $db_name.$db_table_name $where ORDER BY unix_timestamp(calldate) ASC LIMIT $result_limit";
-
+cdr
-    $group_by_str = '';
-    foreach($result3 as $row) {

modules/branches/2.10/ivr/install.php

@@ -295 +295 @@
-  
-   //this was installed perviously, but we perfer to use our old table when migrating
+  sql('RENAME TABLE ivr_dests TO ivr_entries');
+
+  /*
-  sql('DROP TABLE ivr_details');
-  sql('RENAME TABLE ivr TO ivr_details');
-  sql('RENAME TABLE ivr_dests TO ivr_entries');
-  sql('ALTER TABLE ivr_details 
-  CHANGE ivr_id id int(11) NOT NULL AUTO_INCREMENT, 
@@ -319 +321 @@
-  DROP enable_directory, 
-  DROP dircontext');
+   */
-  
+  $ivr_details = sql('SELECT * from ivr', 'getAll', DB_FETCHMODE_ASSOC);
+  $ins_arr = array();
+  foreach ($ivr_details as $r) {
+    if ($r['name'] == "__install_done") {
+      continue;
+    }
+    $ins_arr[] = array(
+      $r['ivr_id'],            // id
+      $r['displayname'],       // name
+      $r['announcement_id'],   // announcement
+      $r['enable_directdial'], // directdial
+      $r['loops'],             // invalid_loops
+      $r['alt_timeout'],       // timeout_enabled
+      $r['invalid_id'],        // invalid_recording
+      $r['retvm'],             // retvm
+      $r['timeout'],           // timeout_time
+      $r['timeout_id'],        // timeout_recording
+      $r['loops'],             // timeout_loops
+    );
+  }
+  $compiled = $db->prepare('
+    INSERT INTO ivr_details 
+    (id, name, announcement, directdial, invalid_loops, timeout_enabled, invalid_recording, retvm, timeout_time, timeout_recording, timeout_loops)
+    VALUES 
+    (?,?,?,?,?,?,?,?,?,?,?)
+    ');
+  $result = $db->executeMultiple($compiled,$ins_arr);
+  if(DB::IsError($result)) {
+    die_freepbx($result->getDebugInfo().'error migrating ivr to ivr_details');  
+  } else {
+    out(_("migrated table ivr to ivr_details"));
+    sql('DROP TABLE ivr');
+  }
+
+  /*
-  sql('DELETE FROM ivr_details WHERE name = "__install_done"');
-  //copy loops from invalid to timeout
-  sql('UPDATE ivr_details SET timeout_loops = invalid_loops');
+   */
+
-  $ivr = $db->getAll('SELECT * FROM ivr_details', DB_FETCHMODE_ASSOC);
-  if($db->IsError($ivr)) {

modules/branches/2.10/recordings/page.recordings.php

@@ -211 +211 @@
-    $destfilename = $recordings_save_path.$dest."ivrrecording.".$suffix;
-    move_uploaded_file($_FILES['ivrfile']['tmp_name'], $destfilename);
-asterisk ".
+" . $amp_conf['AMPASTERISKGROUP'] . " " . 
-    system("chmod g+rw ".$destfilename);
-    echo "<h6>"._("Successfully uploaded")." ".$_FILES['ivrfile']['name']."</h6>";