dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CDR & Archive: Merge and simplify, integrating some features of CDR into Archive.

Browse Source
This commit is contained in:
Nate
2020-02-11 10:44:00 -07:00
parent 6b03479cfa
commit dbdfafcfd8
5 changed files with 104 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/xml_cdr/xml_cdr_inc.php
+12 -16
View File
@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2019
Portions created by the Initial Developer are Copyright (C) 2008-2020
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -28,6 +28,7 @@
require_once "root.php";
require_once "resources/require.php";
require_once "resources/check_auth.php";
require_once "resources/paging.php";
//check permissions
if (permission_exists('xml_cdr_view')) {
@@ -38,9 +39,6 @@
exit;
}
//additional includes
require_once "resources/paging.php";
//set 24hr or 12hr clock
define('TIME_24HR', 1);
@@ -109,7 +107,7 @@
}
//check to see if permission does not exist
if(!permission_exists('xml_cdr_b_leg')){
if (!permission_exists('xml_cdr_b_leg')) {
$leg = 'a';
}
@@ -520,16 +518,14 @@
}
$sql = str_replace(" ", " ", $sql);
$database = new database;
if ($archive_request == 'true') {
if ($_SESSION['cdr']['archive_database']['boolean'] == 'true') {
$database->driver = $_SESSION['cdr']['archive_database_driver']['text'];
$database->host = $_SESSION['cdr']['archive_database_host']['text'];
$database->type = $_SESSION['cdr']['archive_database_type']['text'];
$database->port = $_SESSION['cdr']['archive_database_port']['text'];
$database->db_name = $_SESSION['cdr']['archive_database_name']['text'];
$database->username = $_SESSION['cdr']['archive_database_username']['text'];
$database->password = $_SESSION['cdr']['archive_database_password']['text'];
}
if ($archive_request && $_SESSION['cdr']['archive_database']['boolean'] == 'true') {
$database->driver = $_SESSION['cdr']['archive_database_driver']['text'];
$database->host = $_SESSION['cdr']['archive_database_host']['text'];
$database->type = $_SESSION['cdr']['archive_database_type']['text'];
$database->port = $_SESSION['cdr']['archive_database_port']['text'];
$database->db_name = $_SESSION['cdr']['archive_database_name']['text'];
$database->username = $_SESSION['cdr']['archive_database_username']['text'];
$database->password = $_SESSION['cdr']['archive_database_password']['text'];
}
$result = $database->select($sql, $parameters, 'all');
$result_count = (count($result) ? count($result) : 0);
@@ -541,4 +537,4 @@
list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page, false, $result_count); //bottom
}
?>
?>