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

php 8.1 changes (#6719)

Browse Source 
* Update email_template_edit.php

* Update menu.php

* Update menu_edit.php

* Update number_translations.php

* Update number_translations.php

* Update email_templates.php

* Update email_templates.php

* Update setting_edit.php

* Update call_block.php

* Update call_block_edit.php

* Update email_template_edit.php

* Update call_block.php
This commit is contained in:
Alex
2023-05-25 12:38:32 -06:00
committed by GitHub
parent e3dce560cf
commit 5bb29763ad
8 changed files with 126 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/menu/menu.php
+26 -19
View File
@@ -45,15 +45,22 @@
$language = new text;
$text = $language->get();
//set additional variables
$search = $_GET["search"] ?? '';
//set from session variables
$list_row_edit_button = !empty($_SESSION['theme']['list_row_edit_button']['boolean']) ? $_SESSION['theme']['list_row_edit_button']['boolean'] : 'false';
$button_icon_add = !empty($_SESSION['theme']['button_icon_add']) ? $_SESSION['theme']['button_icon_add'] : '';
//get the http post data
if (is_array($_POST['menus'])) {
$action = $_POST['action'];
$search = $_POST['search'];
$menus = $_POST['menus'];
if (!empty($_POST['menus'])) {
$action = $_POST['action'] ?? '';
$search = $_POST['search'] ?? '';
$menus = $_POST['menus'] ?? '';
}
//process the http post data by action
if ($action != '' && is_array($menus) && @sizeof($menus) != 0) {
if (!empty($action) && !empty($menus)) {
switch ($action) {
case 'delete':
if (permission_exists('menu_delete')) {
@@ -63,16 +70,16 @@
break;
}
header('Location: menu.php'.($search != '' ? '?search='.urlencode($search) : null));
header('Location: menu.php'.(!empty($search) ? '?search='.urlencode($search) : null));
exit;
}
//get order and order by
$order_by = $_GET["order_by"];
$order = $_GET["order"];
$order_by = $_GET["order_by"] ?? '';
$order = $_GET["order"] ?? '';
//add the search string
if (isset($_GET["search"])) {
if (!empty($_GET["search"])) {
$search = strtolower($_GET["search"]);
$sql_search = " (";
$sql_search .= " lower(menu_name) like :search ";
@@ -88,14 +95,14 @@
$sql .= "where ".$sql_search;
}
$database = new database;
$num_rows = $database->select($sql, $parameters, 'column');
$num_rows = $database->select($sql, $parameters ?? '', 'column');
//get the list
$sql = str_replace('count(menu_uuid)', '*', $sql);
$sql .= order_by($order_by, $order, 'menu_name', 'asc');
$sql .= limit_offset($rows_per_page, $offset);
$sql .= limit_offset($rows_per_page ?? '', $offset ?? '');
$database = new database;
$menus = $database->select($sql, $parameters, 'all');
$menus = $database->select($sql, $parameters ?? '', 'all');
unset($sql, $parameters);
//create token
@@ -120,7 +127,7 @@
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'menu.php','style'=>($search == '' ? 'display: none;' : null)]);
if ($paging_controls_mini != '') {
if (!empty($paging_controls_mini)) {
echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
}
echo " </form>\n";
@@ -143,18 +150,18 @@
echo "<tr class='list-header'>\n";
if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) {
echo " <th class='checkbox'>\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($menus ?: "style='visibility: hidden;'").">\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".(!empty($menus) ?: "style='visibility: hidden;'").">\n";
echo " </th>\n";
}
echo th_order_by('menu_name', $text['label-menu_name'], $order_by, $order);
echo th_order_by('menu_language', $text['label-menu_language'], $order_by, $order);
echo " <th class='hide-sm-dn'>".$text['label-menu_description']."</th>\n";
if (permission_exists('menu_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
if (permission_exists('menu_edit') && $list_row_edit_button == 'true') {
echo " <td class='action-button'>&nbsp;</td>\n";
}
echo "</tr>\n";
if (is_array($menus) && @sizeof($menus) != 0) {
if (!empty($menus)) {
$x = 0;
foreach ($menus as $row) {
if (permission_exists('menu_edit')) {
@@ -177,9 +184,9 @@
echo " </td>\n";
echo " <td>".escape($row['menu_language'])."</td>\n";
echo " <td class='description overflow hide-sm-dn'>".escape($row['menu_description'])."</td>\n";
if (permission_exists('menu_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
if (permission_exists('menu_edit') && $list_row_edit_button == 'true') {
echo " <td class='action-button'>\n";
echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$button_icon_edit,'link'=>$list_row_url]);
echo " </td>\n";
}
echo "</tr>\n";
@@ -190,7 +197,7 @@
echo "</table>\n";
echo "<br />\n";
echo "<div align='center'>".$paging_controls."</div>\n";
echo "<div align='center'>".!empty($paging_controls)."</div>\n";
echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
echo "</form>\n";
core/menu/menu_edit.php
+8 -8
View File
@@ -46,7 +46,7 @@
$text = $language->get();
//action add or update
if (is_uuid($_REQUEST["id"])) {
if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
$action = "update";
$menu_uuid = $_REQUEST["id"];
}
@@ -135,14 +135,14 @@
}
//pre-populate the form
if (count($_GET) > 0 && is_uuid($_GET["id"]) && $_POST["persistformvar"] != "true") {
if (count($_GET) > 0 && is_uuid($_GET["id"]) && empty($_POST["persistformvar"])) {
$menu_uuid = $_GET["id"];
$sql = "select * from v_menus ";
$sql .= "where menu_uuid = :menu_uuid ";
$parameters['menu_uuid'] = $menu_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && sizeof($row) != 0) {
if (!empty($row)) {
$menu_uuid = $row["menu_uuid"];
$menu_name = $row["menu_name"];
$menu_language = $row["menu_language"];
@@ -166,7 +166,7 @@
echo " <div class='heading'><b>".$text['header-menu']."</b></div>\n";
echo " <div class='actions'>\n";
echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-xs','link'=>'menu.php']);
echo button::create(['type'=>'button','label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reload'],'collapse'=>'hide-xs','style'=>'margin-left: 15px;','link'=>'menu_reload.php?menu_uuid='.urlencode($menu_uuid).'&menu_language='.urlencode($menu_language)]);
echo button::create(['type'=>'button','label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reload'],'collapse'=>'hide-xs','style'=>'margin-left: 15px;','link'=>'menu_reload.php?menu_uuid='.urlencode($menu_uuid ?? '').'&menu_language='.urlencode($menu_language ?? '')]);
if (permission_exists('menu_restore') && $action == "update") {
echo button::create(['type'=>'button','label'=>$text['button-restore_default'],'icon'=>'undo-alt','collapse'=>'hide-xs','onclick'=>"modal_open('modal-restore','btn_restore');"]);
}
@@ -189,7 +189,7 @@
echo " ".$text['label-name']."\n";
echo "</td>\n";
echo "<td width='70%' class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='menu_name' maxlength='255' value=\"".escape($menu_name)."\">\n";
echo " <input class='formfld' type='text' name='menu_name' maxlength='255' value=\"".escape($menu_name ?? '')."\">\n";
echo "<br />\n";
echo "\n";
echo $text['description-name']."</td>\n";
@@ -200,7 +200,7 @@
echo " ".$text['label-language']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='menu_language' maxlength='255' value=\"".escape($menu_language)."\">\n";
echo " <input class='formfld' type='text' name='menu_language' maxlength='255' value=\"".escape($menu_language ?? '')."\">\n";
echo "<br />\n";
echo $text['description-language']."\n";
echo "</td>\n";
@@ -211,7 +211,7 @@
echo " ".$text['label-description']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='menu_description' maxlength='255' value=\"".escape($menu_description)."\">\n";
echo " <input class='formfld' type='text' name='menu_description' maxlength='255' value=\"".escape($menu_description ?? '')."\">\n";
echo "<br />\n";
echo $text['description-description']."\n";
echo "</td>\n";
@@ -235,4 +235,4 @@
//include the footer
require_once "resources/footer.php";
?>
?>