mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Added User Column in Fax Queue. (#6848)
* enable/disable codec settings for all accounts The template for codec enable settings was taking a value as 1 if it was set in the settings. It was not taking the actual value inside it. So I have edited the templates to check the value if it's set to true. * Update fax_queue.php I added a user column in the Fax Queue to see which user sent the fax. * Update app_languages.php Added field for User
This commit is contained in:
Krushali Shah
@@ -432,6 +432,30 @@ $text['description-fax_email_address']['zh-cn'] = "输入传真电子邮件地
|
||||
$text['description-fax_email_address']['ja-jp'] = "FAXのメールアドレスを入力します。";
|
||||
$text['description-fax_email_address']['ko-kr'] = "팩스 이메일 주소를 입력합니다.";
|
||||
|
||||
$text['label-insert_user']['en-us'] = "User";
|
||||
$text['label-insert_user']['en-gb'] = "User";
|
||||
$text['label-insert_user']['ar-eg'] = "مستخدم";
|
||||
$text['label-insert_user']['de-at'] = "Benutzer";
|
||||
$text['label-insert_user']['de-ch'] = "Benutzer";
|
||||
$text['label-insert_user']['de-de'] = "Benutzer";
|
||||
$text['label-insert_user']['es-cl'] = "Usuario";
|
||||
$text['label-insert_user']['es-mx'] = "Usuario";
|
||||
$text['label-insert_user']['fr-ca'] = "Utilisateur";
|
||||
$text['label-insert_user']['fr-fr'] = "Utilisateur";
|
||||
$text['label-insert_user']['he-il'] = "משתמש";
|
||||
$text['label-insert_user']['it-it'] = "";
|
||||
$text['label-insert_user']['nl-nl'] = "Utente";
|
||||
$text['label-insert_user']['pl-pl'] = "Użytkownik";
|
||||
$text['label-insert_user']['pt-br'] = "Usuário";
|
||||
$text['label-insert_user']['pt-pt'] = "Utilizado";
|
||||
$text['label-insert_user']['ro-ro'] = "Utilizator";
|
||||
$text['label-insert_user']['ru-ru'] = "Пользователь";
|
||||
$text['label-insert_user']['sv-se'] = "Användare";
|
||||
$text['label-insert_user']['uk-ua'] = "Користувач";
|
||||
$text['label-insert_user']['zh-cn'] = "用户";
|
||||
$text['label-insert_user']['ja-jp'] = "ユーザー";
|
||||
$text['label-insert_user']['ko-kr'] = "사용자";
|
||||
|
||||
$text['label-fax_file']['en-us'] = "File";
|
||||
$text['label-fax_file']['en-gb'] = "File";
|
||||
$text['label-fax_file']['ar-eg'] = "ملف";
|
||||
|
||||
@@ -110,8 +110,9 @@
|
||||
else {
|
||||
//show only assigned fax extensions
|
||||
$sql = trim($sql);
|
||||
$sql .= ", v_fax as f, v_fax_users as u \n";
|
||||
$sql .= "where f.fax_uuid = u.fax_uuid \n";
|
||||
$sql .= "from v_fax_queue as q, v_domains as d, v_users as u \n";
|
||||
$sql .= "where q.domain_uuid = d.domain_uuid \n";
|
||||
$sql .= "and q.insert_user = u.user_uuid \n";
|
||||
$sql .= "and q.domain_uuid = :domain_uuid \n";
|
||||
$sql .= "and u.user_uuid = :user_uuid \n";
|
||||
$parameters['domain_uuid'] = $domain_uuid;
|
||||
@@ -124,6 +125,7 @@
|
||||
$sql .= " or lower(q.fax_caller_id_number) like :search \n";
|
||||
$sql .= " or lower(q.fax_number) like :search \n";
|
||||
$sql .= " or lower(q.fax_email_address) like :search \n";
|
||||
$sql .= " or lower(q.insert_user) like :search \n";
|
||||
$sql .= " or lower(q.fax_file) like :search \n";
|
||||
$sql .= " or lower(q.fax_status) like :search \n";
|
||||
$sql .= " or lower(q.fax_accountcode) like :search \n";
|
||||
@@ -148,81 +150,84 @@
|
||||
$offset = $rows_per_page * $page;
|
||||
|
||||
//get the list
|
||||
$sql = "select \n";
|
||||
$sql .= "d.domain_name, \n";
|
||||
$sql .= "q.domain_uuid, \n";
|
||||
$sql .= "q.fax_queue_uuid, \n";
|
||||
$sql .= "q.fax_uuid, \n";
|
||||
$sql .= "q.fax_date, \n";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_date), 'DD Mon YYYY') as fax_date_formatted, \n";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_date), 'HH12:MI:SS am') as fax_time_formatted, \n";
|
||||
$sql .= "q.hostname, \n";
|
||||
$sql .= "q.fax_caller_id_name, \n";
|
||||
$sql .= "q.fax_caller_id_number, \n";
|
||||
$sql .= "q.fax_number, \n";
|
||||
$sql .= "q.fax_prefix, \n";
|
||||
$sql .= "q.fax_email_address, \n";
|
||||
$sql .= "q.fax_file, \n";
|
||||
$sql .= "q.fax_status, \n";
|
||||
$sql .= "q.fax_retry_date, \n";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'DD Mon YYYY') as fax_retry_date_formatted, \n";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'HH12:MI:SS am') as fax_retry_time_formatted, \n";
|
||||
$sql .= "q.fax_notify_date, \n";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'DD Mon YYYY') as fax_notify_date_formatted, \n";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'HH12:MI:SS am') as fax_notify_time_formatted, \n";
|
||||
$sql .= "q.fax_retry_count, \n";
|
||||
$sql .= "q.fax_accountcode, \n";
|
||||
$sql .= "q.fax_command \n";
|
||||
$sql .= "from v_fax_queue as q, v_domains as d \n";
|
||||
$sql = "SELECT ";
|
||||
$sql .= "d.domain_name, ";
|
||||
$sql .= "q.domain_uuid, ";
|
||||
$sql .= "q.fax_queue_uuid, ";
|
||||
$sql .= "q.fax_uuid, ";
|
||||
$sql .= "q.fax_date, ";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_date), 'DD Mon YYYY') as fax_date_formatted, ";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_date), 'HH12:MI:SS am') as fax_time_formatted, ";
|
||||
$sql .= "q.hostname, ";
|
||||
$sql .= "q.fax_caller_id_name, ";
|
||||
$sql .= "q.fax_caller_id_number, ";
|
||||
$sql .= "q.fax_number, ";
|
||||
$sql .= "q.fax_prefix, ";
|
||||
$sql .= "q.fax_email_address, ";
|
||||
$sql .= "u.username as insert_user, ";
|
||||
$sql .= "q.fax_file, ";
|
||||
$sql .= "q.fax_status, ";
|
||||
$sql .= "q.fax_retry_date, ";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'DD Mon YYYY') as fax_retry_date_formatted, ";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'HH12:MI:SS am') as fax_retry_time_formatted, ";
|
||||
$sql .= "q.fax_notify_date, ";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'DD Mon YYYY') as fax_notify_date_formatted, ";
|
||||
$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'HH12:MI:SS am') as fax_notify_time_formatted, ";
|
||||
$sql .= "q.fax_retry_count, ";
|
||||
$sql .= "q.fax_accountcode, ";
|
||||
$sql .= "q.fax_command ";
|
||||
$sql .= "FROM v_fax_queue AS q ";
|
||||
$sql .= "JOIN v_users AS u ON q.insert_user = u.user_uuid ";
|
||||
$sql .= "JOIN v_domains AS d ON q.domain_uuid = d.domain_uuid ";
|
||||
|
||||
if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('fax_queue_all')) {
|
||||
//show faxes for all domains
|
||||
$sql .= "where true \n";
|
||||
// show faxes for all domains
|
||||
$sql .= "WHERE true ";
|
||||
}
|
||||
elseif (permission_exists('fax_queue_domain')) {
|
||||
//show faxes for one domain
|
||||
$sql .= "where q.domain_uuid = :domain_uuid \n";
|
||||
// show faxes for one domain
|
||||
$sql .= "WHERE q.domain_uuid = :domain_uuid ";
|
||||
$parameters['domain_uuid'] = $domain_uuid;
|
||||
}
|
||||
else {
|
||||
//show only assigned fax extensions
|
||||
$sql = trim($sql);
|
||||
$sql .= ", v_fax as f, v_fax_users as u \n";
|
||||
$sql .= "where f.fax_uuid = u.fax_uuid \n";
|
||||
$sql .= "and q.domain_uuid = :domain_uuid \n";
|
||||
$sql .= "and u.user_uuid = :user_uuid \n";
|
||||
// show only assigned fax extensions
|
||||
$sql .= "WHERE q.domain_uuid = :domain_uuid ";
|
||||
$sql .= "AND u.user_uuid = :user_uuid ";
|
||||
$parameters['domain_uuid'] = $domain_uuid;
|
||||
$parameters['user_uuid'] = $_SESSION['user_uuid'];
|
||||
}
|
||||
$sql .= "and q.domain_uuid = d.domain_uuid ";
|
||||
if (isset($_GET["search"])) {
|
||||
$sql .= "and ( \n";
|
||||
$sql .= " lower(q.hostname) like :search \n";
|
||||
$sql .= " or lower(q.fax_caller_id_name) like :search \n";
|
||||
$sql .= " or lower(q.fax_caller_id_number) like :search \n";
|
||||
$sql .= " or lower(q.fax_number) like :search \n";
|
||||
$sql .= " or lower(q.fax_email_address) like :search \n";
|
||||
$sql .= " or lower(q.fax_file) like :search \n";
|
||||
$sql .= " or lower(q.fax_status) like :search \n";
|
||||
$sql .= " or lower(q.fax_accountcode) like :search \n";
|
||||
|
||||
if (isset($search)) {
|
||||
$sql .= "AND (";
|
||||
$sql .= " LOWER(q.hostname) LIKE :search ";
|
||||
$sql .= " OR LOWER(q.fax_caller_id_name) LIKE :search ";
|
||||
$sql .= " OR LOWER(q.fax_caller_id_number) LIKE :search ";
|
||||
$sql .= " OR LOWER(q.fax_number) LIKE :search ";
|
||||
$sql .= " OR LOWER(q.fax_email_address) LIKE :search ";
|
||||
$sql .= " OR LOWER(u.username) LIKE :search ";
|
||||
$sql .= " OR LOWER(q.fax_file) LIKE :search ";
|
||||
$sql .= " OR LOWER(q.fax_status) LIKE :search ";
|
||||
$sql .= " OR LOWER(q.fax_accountcode) LIKE :search ";
|
||||
$sql .= ") ";
|
||||
$parameters['search'] = '%'.$search.'%';
|
||||
$parameters['search'] = '%' . $search . '%';
|
||||
}
|
||||
|
||||
if (isset($_GET["fax_status"]) && !empty($_GET["fax_status"])) {
|
||||
$sql .= "and q.fax_status = :fax_status \n";
|
||||
$parameters['fax_status'] = $_GET["fax_status"];
|
||||
$sql .= "AND q.fax_status = :fax_status ";
|
||||
$parameters['fax_status'] = $_GET["fax_status"];
|
||||
}
|
||||
|
||||
$sql .= order_by($order_by, $order, 'fax_date', 'desc');
|
||||
$sql .= limit_offset($rows_per_page, $offset);
|
||||
$parameters['time_zone'] = $time_zone;
|
||||
$database = new database;
|
||||
$fax_queue = $database->select($sql, $parameters, 'all');
|
||||
unset($sql, $parameters);
|
||||
unset ($sql, $parameters);
|
||||
|
||||
//create token
|
||||
//create token
|
||||
$object = new token;
|
||||
$token = $object->create($_SERVER['PHP_SELF']);
|
||||
|
||||
//additional includes
|
||||
//additional includes
|
||||
$document['title'] = $text['title-fax_queue'];
|
||||
require_once "resources/header.php";
|
||||
|
||||
@@ -250,9 +255,9 @@
|
||||
echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']);
|
||||
}
|
||||
}
|
||||
echo "<form id='form_search' class='inline' method='get'>\n";
|
||||
echo "<form id='form_search' class='inline' method='get'>\n";
|
||||
echo " <select class='formfld' name='fax_status' style='margin-left: 15px;'>\n";
|
||||
echo " <option value='' selected='selected' disabled hidden>".$text['label-fax_status']."...</option>";
|
||||
echo " <option value='' selected='selected' disabled hidden>".$text['label-fax_status']."...</option>";
|
||||
echo " <option value=''></option>\n";
|
||||
echo " <option value='waiting' ".(!empty($_GET["fax_status"]) && $_GET["fax_status"] == "waiting" ? "selected='selected'" : null).">".ucwords($text['label-waiting'])."</option>\n";
|
||||
echo " <option value='sending' ".(!empty($_GET["fax_status"]) && $_GET["fax_status"] == "sending" ? "selected='selected'" : null).">".ucwords($text['label-sending'])."</option>\n";
|
||||
@@ -261,10 +266,10 @@
|
||||
echo " <option value='busy' ".(!empty($_GET["fax_status"]) && $_GET["fax_status"] == "busy" ? "selected='selected'" : null).">".ucwords($text['label-busy'])."</option>\n";
|
||||
echo " <option value='failed' ".(!empty($_GET["fax_status"]) && $_GET["fax_status"] == "failed" ? "selected='selected'" : null).">".ucwords($text['label-failed'])."</option>\n";
|
||||
echo " </select>\n";
|
||||
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search ?? '')."\" placeholder=\"".$text['label-search']."\" />";
|
||||
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search ?? '')."\" placeholder=\"".$text['label-search']."\" />";
|
||||
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
|
||||
if (!empty($paging_controls_mini)) {
|
||||
echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
|
||||
echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
|
||||
}
|
||||
echo " </form>\n";
|
||||
echo " </div>\n";
|
||||
@@ -304,7 +309,8 @@
|
||||
echo th_order_by('fax_caller_id_number', $text['label-fax_caller_id_number'], $order_by, $order);
|
||||
echo th_order_by('fax_number', $text['label-fax_number'], $order_by, $order);
|
||||
echo th_order_by('fax_email_address', $text['label-fax_email_address'], $order_by, $order);
|
||||
// echo th_order_by('fax_file', $text['label-fax_file'], $order_by, $order);
|
||||
echo th_order_by('insert_user', $text['label-insert_user'], $order_by, $order);
|
||||
// echo th_order_by('fax_file', $text['label-fax_file'], $order_by, $order);
|
||||
echo th_order_by('fax_status', $text['label-fax_status'], $order_by, $order);
|
||||
echo th_order_by('fax_retry_date', $text['label-fax_retry_date'], $order_by, $order);
|
||||
echo th_order_by('fax_notify_date', $text['label-fax_notify_date'], $order_by, $order);
|
||||
@@ -337,7 +343,8 @@
|
||||
echo " <td>".escape($row['fax_caller_id_number'])."</td>\n";
|
||||
echo " <td>".escape($row['fax_number'])."</td>\n";
|
||||
echo " <td>".escape(str_replace(',', ' ', $row['fax_email_address'] ?? ''))."</td>\n";
|
||||
// echo " <td>".escape($row['fax_file'])."</td>\n";
|
||||
echo " <td>".escape($row['insert_user']) ."</td>\n";
|
||||
// echo " <td>".escape($row['fax_file'])."</td>\n";
|
||||
echo " <td>".ucwords($text['label-'.$row['fax_status']])."</td>\n";
|
||||
echo " <td>".escape($row['fax_retry_date_formatted'])." ".escape($row['fax_retry_time_formatted'])."</td>\n";
|
||||
echo " <td>".escape($row['fax_notify_date_formatted'])." ".escape($row['fax_notify_time_formatted'])."</td>\n";
|
||||
|
||||
Reference in New Issue
Block a user