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

Php 8.1 call forward fixes (#6716) 

* various PHP 8.1 warning fixes

* various PHP 8.1 warning fixes and create class constants
This commit is contained in:
frytimo 2023-05-24 13:24:39 -03:00 committed by GitHub
parent eafa89a624
commit c03ae6e098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 364 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
app/call_forward/call_forward.php
View File

@ -1,4 +1,5 @@
<?php
/*
FusionPBX
Version: MPL 1.1
@ -24,6 +25,9 @@
Mark J Crane <markjcrane@fusionpbx.com>
*/
//set default
$is_included = false;
//set the include path
$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE);
set_include_path(parse_ini_file($conf[0])['document.root']);
@ -36,8 +40,7 @@
//check permissions
if (permission_exists('follow_me') || permission_exists('call_forward') || permission_exists('do_not_disturb')) {
//access granted
}
else {
} else {
echo "access denied";
exit;
}
@ -46,15 +49,13 @@
$language = new text;
$text = $language->get($_SESSION['domain']['language']['code'], 'app/call_forward');
//get posted data
if (is_array($_POST['extensions'])) {
$action = $_POST['action'];
$search = $_POST['search'];
$extensions = $_POST['extensions'];
}
//get posted data and set defaults
$action = $_POST['action'] ?? '';
$search = $_POST['search'] ?? '';
$extensions = $_POST['extensions'] ?? [];
//process the http post data by action
if ($action != '' && is_array($extensions) && @sizeof($extensions) != 0) {
if (!empty($action) && count($extensions) > 0) {
switch ($action) {
case 'toggle_call_forward':
if (permission_exists('call_forward')) {
@ -81,18 +82,20 @@
}
//get order and order by
$order_by = $_GET["order_by"];
$order = $_GET["order"];
$order_by = $_GET["order_by"] ?? '';
$order = $_GET["order"] ?? '';
//get the search
$search = strtolower($_GET["search"]);
$search = strtolower($_GET["search"] ?? '');
//set the show variable
$show = $_GET['show'] ?? 'domain';
//define select count query
$sql = "select count(*) from v_extensions ";
if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
if ($show === "all" && permission_exists('call_forward_all')) {
$sql .= "where true ";
}
else {
} else {
$sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
@ -109,50 +112,55 @@
$sql .= "and (";
$x = 0;
foreach ($_SESSION['user']['extension'] as $row) {
if ($x > 0) { $sql .= "or "; }
if ($x > 0) {
$sql .= "or ";
}
$sql .= "extension = '" . $row['user'] . "' ";
$x++;
}
$sql .= ")";
}
else {
} else {
//used to hide any results when a user has not been assigned an extension
$sql .= "and extension = 'disabled' ";
}
}
$sql .= $sql_search;
$database = new database;
$num_rows = $database->select($sql, $parameters, 'column');
unset($parameters);
//prepare the paging
if ($is_included) {
$rows_per_page = 10;
$rows_per_page = !empty($_SESSION['domain']['paging']['numeric']) ? $_SESSION['domain']['paging']['numeric'] : 50;
$params[] = "app_uuid=" . call_forward::APP_UUID;
if ($search) {
$params[] = "search=" . $search;
}
else {
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
if ($order_by) {
$params[] = "order_by=" . $order_by;
}
$params[] = "app_uuid=".$app_uuid;
if ($search) { $params[] = "search=".$search; }
if ($order_by) { $params[] = "order_by=".$order_by; }
if ($order) { $params[] = "order=".$order; }
if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
if ($order) {
$params[] = "order=" . $order;
}
if ($show == "all" && permission_exists('call_forward_all')) {
$params[] .= "show=all";
}
$param = $params ? implode('&', $params) : null;
$param = !empty($params) ? implode('&', $params) : '';
unset($params);
$page = $_GET['page'];
if (empty($page)) { $page = 0; $_GET['page'] = 0; }
$page = $_GET['page'] ?? '';
if (empty($page)) {
$page = 0;
$_GET['page'] = 0;
}
list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
$offset = $rows_per_page * $page;
//get the list
$sql = "select * from v_extensions ";
if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
if ($show == "all" && permission_exists('call_forward_all')) {
$sql .= "where true ";
}
else {
} else {
$sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
}
@ -169,24 +177,29 @@
$sql .= "and (";
$x = 0;
foreach ($_SESSION['user']['extension'] as $row) {
if ($x > 0) { $sql .= "or "; }
if ($x > 0) {
$sql .= "or ";
}
$sql .= "extension = '" . $row['user'] . "' ";
$x++;
}
$sql .= ")";
}
else {
} else {
//used to hide any results when a user has not been assigned an extension
$sql .= "and extension = 'disabled' ";
}
}
$sql .= $sql_search;
$sql .= order_by($order_by, $order, 'extension', 'asc');
$sql .= limit_offset($rows_per_page, $offset);
$database = new database;
$extensions = $database->select($sql, $parameters, 'all');
unset($parameters);
//if there are no extensions then set to empty array
if($extensions === false) {
$extensions = [];
}
//create token
$object = new token;
$token = $object->create($_SERVER['PHP_SELF']);
@ -208,13 +221,12 @@
echo " </div>\n";
echo " <div style='clear: both;'></div>\n";
echo "</div>\n";
}
else {
} else {
echo "<div class='action_bar' id='action_bar'>\n";
echo " <div class='heading'><b>" . $text['header-call_forward'] . " (" . $num_rows . ")</b></div>\n";
echo " <div class='actions'>\n";
if ($extensions) {
if (count($extensions) > 0) {
if (permission_exists('call_forward')) {
echo button::create(['type' => 'button', 'label' => $text['label-call_forward'], 'icon' => $_SESSION['theme']['button_icon_toggle'], 'collapse' => false, 'name' => 'btn_toggle_cfwd', 'onclick' => "list_action_set('toggle_call_forward'); modal_open('modal-toggle','btn_toggle');"]);
}
@ -225,11 +237,11 @@
echo button::create(['type' => 'button', 'label' => $text['label-dnd'], 'icon' => $_SESSION['theme']['button_icon_toggle'], 'collapse' => false, 'name' => 'btn_toggle_dnd', 'onclick' => "list_action_set('toggle_do_not_disturb'); modal_open('modal-toggle','btn_toggle');"]);
}
}
if ($_GET['show'] !== 'all' && permission_exists('call_forward_all')) {
echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all'.($params ? '&'.implode('&', $params) : null)]);
if ($show !== 'all' && permission_exists('call_forward_all')) {
echo button::create(['type' => 'button', 'label' => $text['button-show_all'], 'icon' => $_SESSION['theme']['button_icon_all'], 'link' => '?show=all' . $param]);
}
echo "<form id='form_search' class='inline' method='get'>\n";
if ($_GET['show'] == 'all' && permission_exists('call_forward_all')) {
if ($show == 'all' && permission_exists('call_forward_all')) {
echo " <input type='hidden' name='show' value='all'>";
}
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"" . escape($search) . "\" placeholder=\"" . $text['label-search'] . "\" onkeydown=''>";
@ -243,7 +255,7 @@
echo " <div style='clear: both;'></div>\n";
echo "</div>\n";
if ($extensions) {
if (count($extensions) > 0) {
echo modal::create(['id' => 'modal-toggle', 'type' => 'toggle', 'actions' => button::create(['type' => 'button', 'label' => $text['button-continue'], 'icon' => 'check', 'id' => 'btn_toggle', 'style' => 'float: right; margin-left: 15px;', 'collapse' => 'never', 'onclick' => "modal_close(); list_form_submit('form_list');"])]);
}
@ -251,7 +263,7 @@
echo "<br /><br />\n";
echo "<form id='form_list' method='post'>\n";
if ($_GET['show'] == 'all' && permission_exists('call_forward_all')) {
if ($show == 'all' && permission_exists('call_forward_all')) {
echo " <input type='hidden' name='show' value='all'>";
}
echo "<input type='hidden' id='action' name='action' value=''>\n";
@ -262,9 +274,9 @@
echo "<tr class='list-header'>\n";
if (!$is_included) {
echo " <th class='checkbox'>\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($extensions ?: "style='visibility: hidden;'").">\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' " . (empty($extensions) ?: "style='visibility: hidden;'") . ">\n";
echo " </th>\n";
if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
if ($show == "all" && permission_exists('call_forward_all')) {
echo "<th>" . $text['label-domain'] . "</th>\n";
}
}
@ -279,7 +291,8 @@
echo " <th>" . $text['label-dnd'] . "</th>\n";
}
echo " <th class='" . ($is_included ? 'hide-md-dn' : 'hide-sm-dn') . "'>" . $text['label-description'] . "</th>\n";
if ($_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
$list_row_edit_button = $_SESSION['theme']['list_row_edit_button']['boolean'] ?? 'false';
if ( $list_row_edit_button === 'true') {
echo " <td class='action-button'>&nbsp;</td>\n";
}
echo "</tr>\n";
@ -295,11 +308,10 @@
echo " <input type='hidden' name='extensions[$x][uuid]' value='" . escape($row['extension_uuid']) . "' />\n";
echo " </td>\n";
if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
if ($show == "all" && permission_exists('call_forward_all')) {
if (!empty($_SESSION['domains'][$row['domain_uuid']]['domain_name'])) {
$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
}
else {
} else {
$domain = $text['label-global'];
}
echo " <td>" . escape($domain) . "</td>\n";
@ -348,7 +360,6 @@
//}
//unset($button_label);
//----------------------------------
//get destination count
$follow_me_destination_count = 0;
if ($row['follow_me_enabled'] == 'true' && is_uuid($row['follow_me_uuid'])) {
@ -383,7 +394,7 @@
echo " </td>\n";
}
echo " <td class='description overflow " . ($is_included ? 'hide-md-dn' : 'hide-sm-dn') . "'>" . escape($row['description']) . "&nbsp;</td>\n";
if ($_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
if ($list_row_edit_button === 'true') {
echo " <td class='action-button'>";
echo button::create(['type' => 'button', 'title' => $text['button-edit'], 'icon' => $_SESSION['theme']['button_icon_edit'], 'link' => $list_row_url]);
echo " </td>\n";
@ -406,5 +417,4 @@
require_once "resources/footer.php";
}
?>

121
app/call_forward/resources/classes/call_forward.php
View File

@ -1,4 +1,5 @@
<?php
/*
FusionPBX
Version: MPL 1.1
@ -30,19 +31,33 @@
//define the call_forward class
class call_forward {
// set class constants
const APP_NAME = 'calls';
const APP_UUID = '19806921-e8ed-dcff-b325-dd3e5da4959d';
const PERMISSION = 'call_forward';
const LIST_PAGE = 'calls.php';
const TABLE = 'extensions';
const UUID_PREFIX = 'extension_';
const TOGGLE_FIELD = 'forward_all_enabled';
const TOGGLE_VALUES = ['true', 'false'];
public $debug;
public $domain_uuid;
public $domain_name;
public $extension_uuid;
private $extension;
private $number_alias;
public $forward_all_destination;
public $forward_all_enabled;
private $toll_allow;
public $accountcode;
public $outbound_caller_id_name;
public $outbound_caller_id_number;
/**
* declare private variables
*/
private $extension;
private $number_alias;
private $toll_allow;
public function set() {
//create the database connection
$database = new database;
@ -69,8 +84,7 @@
$array['extensions'][0]['forward_all_destination'] = strlen($this->forward_all_destination) != 0 ? $this->forward_all_destination : null;
if (empty($this->forward_all_destination) || $this->forward_all_enabled == "false") {
$array['extensions'][0]['forward_all_enabled'] = 'false';
}
else {
} else {
$array['extensions'][0]['forward_all_enabled'] = 'true';
}
@ -93,55 +107,39 @@
if (!empty($this->number_alias)) {
$cache->delete("directory:" . $this->number_alias . "@" . $this->domain_name);
}
}
/**
* declare private variables
* Toggle an array of call_forward records
* @param array $records array of records to toggle
*/
private $app_name;
private $app_uuid;
private $permission;
private $list_page;
private $table;
private $uuid_prefix;
private $toggle_field;
private $toggle_values;
/**
* toggle records
*/
public function toggle($records) {
//create the database connection
$database = new database;
//assign private variables
$this->app_name = 'calls';
$this->app_uuid = '19806921-e8ed-dcff-b325-dd3e5da4959d';
$this->permission = 'call_forward';
$this->list_page = 'calls.php';
$this->table = 'extensions';
$this->uuid_prefix = 'extension_';
$this->toggle_field = 'forward_all_enabled';
$this->toggle_values = ['true','false'];
if (permission_exists($this->permission)) {
//add multi-lingual support
$language = new text;
$text = $language->get();
public function toggle(array $records) {
//validate the token
$token = new token;
if (!$token->validate($_SERVER['PHP_SELF'])) {
message::add($text['message-invalid_token'], 'negative');
header('Location: '.$this->list_page);
header('Location: ' . self::LIST_PAGE);
exit;
}
//toggle the checked records
if (is_array($records) && @sizeof($records) != 0) {
//validate there are records to process
if (count($records) < 1) return;
//check we have permission for this action
if (permission_exists(self::PERMISSION)) {
//create the database connection
$database = new database;
//add multi-lingual support
$language = new text;
$text = $language->get();
// initialize an empty array
$uuids = [];
$extensions = [];
//get current toggle state
foreach ($records as $x => $record) {
@ -149,16 +147,18 @@
$uuids[] = "'" . $record['uuid'] . "'";
}
}
if (is_array($uuids) && @sizeof($uuids) != 0) {
$sql = "select ".$this->uuid_prefix."uuid as uuid, extension, number_alias, ";
//toggle the checked records
if (count($uuids) > 0) {
$sql = "select " . self::UUID_PREFIX . "uuid as uuid, extension, number_alias, ";
$sql .= "call_timeout, do_not_disturb, ";
$sql .= "forward_all_enabled, forward_all_destination, ";
$sql .= "forward_busy_enabled, forward_busy_destination, ";
$sql .= "forward_no_answer_enabled, forward_no_answer_destination, ";
$sql .= $this->toggle_field." as toggle, follow_me_uuid ";
$sql .= "from v_".$this->table." ";
$sql .= self::TOGGLE_FIELD . " as toggle, follow_me_uuid ";
$sql .= "from v_" . self::TABLE . " ";
$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
$sql .= "and " . self::UUID_PREFIX . "uuid in (" . implode(', ', $uuids) . ") ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$rows = $database->select($sql, $parameters, 'all');
if (is_array($rows) && @sizeof($rows) != 0) {
@ -188,27 +188,26 @@
$destination_exists = $extension['forward_all_destination'] != '' ? true : false;
//determine new state
$new_state = $extension['state'] == $this->toggle_values[1] && $destination_exists ? $this->toggle_values[0] : $this->toggle_values[1];
$new_state = $extension['state'] == self::TOGGLE_VALUES[1] && $destination_exists ? self::TOGGLE_VALUES[0] : self::TOGGLE_VALUES[1];
//toggle feature
if ($new_state != $extension['state']) {
$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $uuid;
$array[$this->table][$x][$this->toggle_field] = $new_state;
$array[self::TABLE][$x][self::UUID_PREFIX . 'uuid'] = $uuid;
$array[self::TABLE][$x][self::TOGGLE_FIELD] = $new_state;
}
//disable other features
if ($new_state == $this->toggle_values[0]) { //true
$array[$this->table][$x]['do_not_disturb'] = $this->toggle_values[1]; //false
$array[$this->table][$x]['follow_me_enabled'] = $this->toggle_values[1]; //false
if ($new_state == self::TOGGLE_VALUES[0]) { //true
$array[self::TABLE][$x]['do_not_disturb'] = self::TOGGLE_VALUES[1]; //false
$array[self::TABLE][$x]['follow_me_enabled'] = self::TOGGLE_VALUES[1]; //false
if (is_uuid($extension['follow_me_uuid'])) {
$array['follow_me'][$x]['follow_me_uuid'] = $extension['follow_me_uuid'];
$array['follow_me'][$x]['follow_me_enabled'] = $this->toggle_values[1]; //false
$array['follow_me'][$x]['follow_me_enabled'] = self::TOGGLE_VALUES[1]; //false
}
}
//increment counter
$x++;
}
//save the changes
@ -219,8 +218,8 @@
$p->add('extension_edit', 'temp');
//save the array
$database->app_name = $this->app_name;
$database->app_uuid = $this->app_uuid;
$database->app_name = self::APP_NAME;
$database->app_uuid = self::APP_UUID;
$database->save($array);
unset($array);
@ -266,15 +265,13 @@
//set message
message::add($text['message-toggle']);
}
unset($records, $extensions, $extension);
}
}
} //function
}// class
//function
}
// class
?>