Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
This commit is contained in:
markjcrane
commit
0da3b9fe4a
|
|
@ -14,7 +14,7 @@
|
|||
$apps[$x]['description']['de-de'] = "";
|
||||
$apps[$x]['description']['de-ch'] = "";
|
||||
$apps[$x]['description']['de-at'] = "";
|
||||
$apps[$x]['description']['fr-fr'] = "Gérer les messages électroniques échoué.";
|
||||
$apps[$x]['description']['fr-fr'] = "GÈrer les messages Èlectroniques ÈchouÈ.";
|
||||
$apps[$x]['description']['fr-ca'] = "";
|
||||
$apps[$x]['description']['fr-ch'] = "";
|
||||
$apps[$x]['description']['pt-pt'] = "Gerenciar mensagens de e-mail falhou.";
|
||||
|
|
@ -38,6 +38,10 @@
|
|||
$apps[$x]['permissions'][$y]['groups'][] = "admin";
|
||||
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
|
||||
$y++;
|
||||
$apps[$x]['permissions'][$y]['name'] = "emails_all";
|
||||
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
|
||||
$y++;
|
||||
|
||||
|
||||
//schema details
|
||||
$y = 1; //table array index
|
||||
|
|
@ -86,4 +90,4 @@
|
|||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,9 @@ else {
|
|||
if ($email_uuid != '') {
|
||||
$sql = "select email from v_emails ";
|
||||
$sql .= "where email_uuid = '".$email_uuid."' ";
|
||||
$sql .= "and domain_uuid = '".$domain_uuid."' ";
|
||||
if (!permission_exists('emails_all') || $_REQUEST['showall'] != 'true') {
|
||||
$sql .= "and domain_uuid = '".$domain_uuid."' ";
|
||||
}
|
||||
$prep_statement = $db->prepare(check_sql($sql));
|
||||
$prep_statement->execute();
|
||||
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
|
||||
|
|
@ -89,7 +91,11 @@ else {
|
|||
$_SESSION["message_mood"] = 'negative';
|
||||
$_SESSION["message_delay"] = '4'; //sec
|
||||
$_SESSION["message"] = $text['message-resend_failed'].": ".$mailer_error;
|
||||
header("Location: emails.php");
|
||||
if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') {
|
||||
header("Location: emails.php?showall=true");
|
||||
} else {
|
||||
header("Location: emails.php");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -110,6 +116,11 @@ else {
|
|||
echo " ".$text['description-emails'];
|
||||
echo " </td>\n";
|
||||
echo " <td width='50%' align='right' valign='top'>\n";
|
||||
if (permission_exists('emails_all')) {
|
||||
if ($_REQUEST['showall'] != 'true') {
|
||||
echo " <input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='emails.php?showall=true';\">\n";
|
||||
}
|
||||
}
|
||||
echo " <input type='button' class='btn' alt=\"".$text['button-refresh']."\" onclick=\"document.location.reload();\" value='".$text['button-refresh']."'>\n";
|
||||
echo " </td>\n";
|
||||
echo " </tr>\n";
|
||||
|
|
@ -118,7 +129,11 @@ else {
|
|||
|
||||
//prepare to page the results
|
||||
$sql = "select count(*) as num_rows from v_emails ";
|
||||
$sql .= "where domain_uuid = '".$domain_uuid."' ";
|
||||
if (permission_exists('emails_all')) {
|
||||
if ($_REQUEST['showall'] != 'true') {
|
||||
$sql .= "where domain_uuid = '".$domain_uuid."' ";
|
||||
}
|
||||
}
|
||||
$prep_statement = $db->prepare($sql);
|
||||
if ($prep_statement) {
|
||||
$prep_statement->execute();
|
||||
|
|
@ -128,7 +143,11 @@ else {
|
|||
|
||||
//prepare to page the results
|
||||
$rows_per_page = 50;
|
||||
$param = "";
|
||||
if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') {
|
||||
$param .= "&showall=true";
|
||||
} else {
|
||||
$param = "";
|
||||
}
|
||||
$page = $_GET['page'];
|
||||
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
|
||||
list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
|
||||
|
|
@ -136,7 +155,11 @@ else {
|
|||
|
||||
//get the list
|
||||
$sql = "select * from v_emails ";
|
||||
$sql .= "where domain_uuid = '".$domain_uuid."' ";
|
||||
if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') {
|
||||
$sql .= " join v_domains on v_emails.domain_uuid = v_domains.domain_uuid ";
|
||||
} else {
|
||||
$sql .= "where domain_uuid = '".$domain_uuid."' ";
|
||||
}
|
||||
if (strlen($order_by)> 0) { $sql .= "order by ".$order_by." ".$order." "; }
|
||||
$sql .= "limit ".$rows_per_page." offset ".$offset." ";
|
||||
$prep_statement = $db->prepare(check_sql($sql));
|
||||
|
|
@ -152,9 +175,12 @@ else {
|
|||
echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
|
||||
|
||||
echo "<tr>\n";
|
||||
echo th_order_by('sent_date', $text['label-sent'], $order_by, $order);
|
||||
echo th_order_by('type', $text['label-type'], $order_by, $order);
|
||||
echo th_order_by('status', $text['label-status'], $order_by, $order);
|
||||
if ($_REQUEST['showall'] == true && permission_exists('emails_all')) {
|
||||
echo th_order_by('domain_name', $text['label-domain-name'], $order_by, $order, null, null, $param);
|
||||
}
|
||||
echo th_order_by('sent_date', $text['label-sent'], $order_by, $order, null, null, $param);
|
||||
echo th_order_by('type', $text['label-type'], $order_by, $order, null, null, $param);
|
||||
echo th_order_by('status', $text['label-status'], $order_by, $order, null, null, $param);
|
||||
echo "<th>".$text['label-message']."</th>\n";
|
||||
echo "<th>".$text['label-reference']."</th>\n";
|
||||
echo "<td class='list_control_icons'> </td>\n";
|
||||
|
|
@ -180,6 +206,10 @@ else {
|
|||
|
||||
$tr_link = "href='email_view.php?id=".$row['email_uuid']."'";
|
||||
echo "<tr ".$tr_link.">\n";
|
||||
if ($_REQUEST['showall'] == true && permission_exists('emails_all')) {
|
||||
echo " <td valign='top' class='".$row_style[$c]."'>".$row['domain_name']."</td>\n";
|
||||
}
|
||||
|
||||
echo " <td valign='top' class='".$row_style[$c]."'>";
|
||||
$sent_date = explode('.', $row['sent_date']);
|
||||
echo $sent_date[0];
|
||||
|
|
@ -192,7 +222,11 @@ else {
|
|||
echo " <a href='?id=".$row['email_uuid']."&a=download'>".$text['label-download']."</a> ";
|
||||
}
|
||||
if (permission_exists('email_resend')) {
|
||||
echo " <a href='?id=".$row['email_uuid']."&a=resend'>".$text['label-resend']."</a>";
|
||||
echo " <a href='?id=".$row['email_uuid']."&a=resend";
|
||||
if ($_REQUEST['showall'] == true && permission_exists('emails_all')) {
|
||||
echo "&showall=true";
|
||||
}
|
||||
echo "'>" . $text['label-resend']."</a>";
|
||||
}
|
||||
echo " </td>\n";
|
||||
echo " <td valign='top' class='row_stylebg tr_link_void' style='white-space: nowrap; vertical-align: top;'>";
|
||||
|
|
@ -229,4 +263,4 @@ else {
|
|||
|
||||
//include the footer
|
||||
require_once "resources/footer.php";
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@ require_once "resources/paging.php";
|
|||
|
||||
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
|
||||
echo "<tr>\n";
|
||||
//echo th_order_by('ring_group_name', $text['label-name'], $order_by, $order);
|
||||
echo th_order_by('ring_group_extension', $text['label-ring-group-extension'], $order_by, $order);
|
||||
//echo th_order_by('ring_group_context', 'Context', $order_by, $order);
|
||||
//echo th_order_by('ring_group_strategy', 'Strategy', $order_by, $order);
|
||||
|
|
@ -136,13 +135,13 @@ require_once "resources/paging.php";
|
|||
//echo th_order_by('ring_group_timeout_data', 'Timeout Data', $order_by, $order);
|
||||
//echo th_order_by('ring_group_enabled', $text['label-enabled'], $order_by, $order);
|
||||
echo "<th>".$text['label-tools']."</th>";
|
||||
echo th_order_by('ring_group_name', $text['label-name'], $order_by, $order);
|
||||
echo th_order_by('ring_group_description', $text['label-description'], $order_by, $order);
|
||||
echo "<tr>\n";
|
||||
|
||||
if ($result_count > 0) {
|
||||
foreach($result as $row) {
|
||||
echo "<tr >\n";
|
||||
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_name']." </td>\n";
|
||||
echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_extension']." </td>\n";
|
||||
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_context']." </td>\n";
|
||||
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_strategy']." </td>\n";
|
||||
|
|
@ -150,6 +149,7 @@ require_once "resources/paging.php";
|
|||
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_timeout_data']." </td>\n";
|
||||
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_enabled']." </td>\n";
|
||||
echo " <td valign='top' class='".$row_style[$c]."'><a href='".PROJECT_PATH."/app/ring_groups/ring_group_forward_edit.php?id=".$row['ring_group_uuid']."&return_url=".urlencode($_SERVER['PHP_SELF'])."' alt='".$text['link-call-forward']."'>".$text['link-call-forward']."</a></td>\n";
|
||||
echo " <td valign='top' class='row_stylebg'>".$row['ring_group_name']." </td>\n";
|
||||
echo " <td valign='top' class='row_stylebg'>".$row['ring_group_description']." </td>\n";
|
||||
echo "</tr>\n";
|
||||
if ($c==0) { $c=1; } else { $c=0; }
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ else {
|
|||
echo " <tr>\n";
|
||||
echo " <td style='vertical-align: top;'>\n";
|
||||
if (permission_exists('xml_cdr_all')) {
|
||||
if ($_GET['showall'] != 'true') {
|
||||
if ($_REQUEST['showall'] != 'true') {
|
||||
echo " <input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='xml_cdr.php?showall=true';\">\n";
|
||||
}
|
||||
}
|
||||
|
|
@ -325,7 +325,7 @@ else {
|
|||
$col_count++;
|
||||
}
|
||||
echo "<th> </th>\n";
|
||||
if ($_GET['showall'] && permission_exists('xml_cdr_all')) {
|
||||
if ($_REQUEST['showall'] && permission_exists('xml_cdr_all')) {
|
||||
echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, null, $param);
|
||||
$col_count++;
|
||||
}
|
||||
|
|
@ -441,7 +441,7 @@ else {
|
|||
}
|
||||
|
||||
if (if_group("admin") || if_group("superadmin") || if_group("cdr")) {
|
||||
$tr_link = "href='xml_cdr_details.php?uuid=".$row['uuid'].(($_GET['showall']) ? "&showall=true" : null)."'";
|
||||
$tr_link = "href='xml_cdr_details.php?uuid=".$row['uuid'].(($_REQUEST['showall']) ? "&showall=true" : null)."'";
|
||||
}
|
||||
else {
|
||||
$tr_link = null;
|
||||
|
|
@ -490,7 +490,7 @@ else {
|
|||
else {
|
||||
echo " <td class='".$row_style[$c]."'> </td>";
|
||||
}
|
||||
if ($_GET['showall'] && permission_exists('xml_cdr_all')) {
|
||||
if ($_REQUEST['showall'] && permission_exists('xml_cdr_all')) {
|
||||
echo " <td valign='top' class='".$row_style[$c]."'>";
|
||||
echo $row['domain_name'].' ';
|
||||
echo " </td>\n";
|
||||
|
|
|
|||
|
|
@ -164,6 +164,12 @@ echo " <tr>";
|
|||
echo " <td class='vncell'>".$text['label-duration']."</td>";
|
||||
echo " <td class='vtable'><input type='text' class='formfld' name='duration' value='$duration'></td>";
|
||||
echo " </tr>";
|
||||
if (permission_exists('xml_cdr_all')) {
|
||||
echo " <tr>";
|
||||
echo " <td class='vncell'>".$text['button-show_all']."</td>";
|
||||
echo " <td class='vtable'><input type='checkbox' class='formfld' name='showall' value='true'></td>";
|
||||
echo " </tr>";
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
echo " </td>";
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ programablekey.1.history_type =
|
|||
programablekey.1.label =
|
||||
|
||||
##########################################################################################
|
||||
## Expansion Key £¨For T38G only£© ##
|
||||
## Expansion Key £¨For T38G only£© ##
|
||||
##########################################################################################
|
||||
#X ranges from 1 to 6, Y ranges from 1 to 39.
|
||||
#expansion_module.x.key.y.type = 37 (Switch by default)
|
||||
|
|
@ -1075,7 +1075,7 @@ phone_setting.lock =
|
|||
phone_setting.phone_lock.unlock_pin =
|
||||
phone_setting.phone_lock.lock_time_out =
|
||||
|
||||
#Configure the ring tone for the phone. System ring tones are: Ring1.wav (default), Ring2.wav¡¡Ring8.wav.
|
||||
#Configure the ring tone for the phone. System ring tones are: Ring1.wav (default), Ring2.wav¡¡Ring8.wav.
|
||||
#You can configure the custom ring tone (Busy.wav) for the phone, the value is: phone_setting.ring_type = Busy.wav
|
||||
phone_setting.ring_type =
|
||||
|
||||
|
|
@ -1133,6 +1133,12 @@ phone_setting.mute_power_led_flash_enable =
|
|||
#Enable or disable the phone to flash the power LED when placing a calll on hold; 0-Disabled (default), 1-Enabled;
|
||||
phone_setting.hold_power_led_flash_enable =
|
||||
|
||||
#######################################################################################
|
||||
## Directory Setting ##
|
||||
#######################################################################################
|
||||
#Configure the access URL of the directory setting file.
|
||||
directory_setting.url = {$yealink_directory_setting_url}
|
||||
|
||||
#######################################################################################
|
||||
## Configure the access URL of firmware ##
|
||||
#######################################################################################
|
||||
|
|
|
|||
|
|
@ -1525,7 +1525,7 @@ super_search.url =
|
|||
## Directory Setting ##
|
||||
#######################################################################################
|
||||
#Configure the access URL of the directory setting file.
|
||||
directory_setting.url =
|
||||
directory_setting.url = {$yealink_directory_setting_url}
|
||||
|
||||
#######################################################################################
|
||||
## Configure the access URL of firmware ##
|
||||
|
|
|
|||
|
|
@ -1565,7 +1565,7 @@ super_search.url =
|
|||
## Directory Setting ##
|
||||
#######################################################################################
|
||||
#Configure the access URL of the directory setting file.
|
||||
directory_setting.url =
|
||||
directory_setting.url = {$yealink_directory_settingurl}
|
||||
|
||||
#######################################################################################
|
||||
## Configure the access URL of firmware ##
|
||||
|
|
|
|||
|
|
@ -1565,7 +1565,7 @@ super_search.url =
|
|||
## Sirectory Setting ##
|
||||
#######################################################################################
|
||||
#Configure the access URL of the directory setting file.
|
||||
directory_setting.url =
|
||||
directory_setting.url = {$yealink_directory_setting_url}
|
||||
|
||||
#######################################################################################
|
||||
## Configure the access URL of firmware ##
|
||||
|
|
|
|||
Loading…
Reference in New Issue