diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php index 0b263b3e60..5570fb76e1 100644 --- a/app/bridges/bridges.php +++ b/app/bridges/bridges.php @@ -117,7 +117,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; +rows_per_pagerows_per_page $rows_per_page = $settings->get('domain', 'paging', 50); $param = !empty($search) ? "&search=".$search : null; $param = (isset($_GET['show']) && $_GET['show'] == 'all' && permission_exists('bridge_all')) ? "&show=all" : null; $page = isset($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 0; diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index 427a8f1716..edd9bb36be 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -66,7 +66,7 @@ $num_rows = $database->select($sql, $parameters, 'column'); //paging the records - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".$search; $page = !empty($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 0; list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php index 50b9e93ee3..3c8ea1743d 100644 --- a/app/call_centers/call_center_queues.php +++ b/app/call_centers/call_center_queues.php @@ -105,7 +105,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".urlencode($search); if ($show == "all" && permission_exists('call_center_all')) { $param .= "&show=all"; diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index 0650531a62..62b2cd8bed 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -175,7 +175,7 @@ $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".urlencode($search); $param .= "&type=".$destination_type; if ($show == "all" && permission_exists('destination_all')) { diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php index eb2bbc8d7c..17ec182efa 100644 --- a/app/devices/device_profiles.php +++ b/app/devices/device_profiles.php @@ -122,7 +122,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = ''; if ($search) { $param .= "&search=".$search; diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php index fdfa897f5e..4936526b1e 100644 --- a/app/devices/device_vendor_functions.php +++ b/app/devices/device_vendor_functions.php @@ -95,7 +95,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = ""; if (isset($_GET['page'])) { $page = $_GET['page']; diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php index 4543867188..9316c7addb 100644 --- a/app/devices/device_vendors.php +++ b/app/devices/device_vendors.php @@ -92,7 +92,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".$search; $page = $_GET['page'] ?? null; if (empty($page)) { $page = 0; $_GET['page'] = 0; } diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php index e10a1f9ceb..594ac14706 100644 --- a/app/dialplans/dialplans.php +++ b/app/dialplans/dialplans.php @@ -192,7 +192,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare the paging - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); if (!empty($app_uuid)) { $params[] = "app_uuid=".urlencode($app_uuid); } if (!empty($context)) { $params[] = "context=".urlencode($context); } if (!empty($search)) { $params[] = "search=".urlencode($search); } diff --git a/app/email_queue/email_queue.php b/app/email_queue/email_queue.php index 4b56e90628..f4585261be 100644 --- a/app/email_queue/email_queue.php +++ b/app/email_queue/email_queue.php @@ -148,7 +148,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = !empty($_GET["email_status"]) ? "&email_status=".urlencode($_GET["email_status"]) : null; $param .= !empty($search) ? "&search=".urlencode($search) : null; $param .= !empty($_REQUEST['show']) && $_REQUEST['show'] == 'all' && permission_exists('email_queue_all') ? "&show=all" : null; diff --git a/app/emergency/emergency.php b/app/emergency/emergency.php index d592926679..d818cac0b9 100644 --- a/app/emergency/emergency.php +++ b/app/emergency/emergency.php @@ -106,7 +106,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); unset($sql, $parameters); //prepare to page the results -$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; +$rows_per_page = $settings->get('domain', 'paging', 50); $param = !empty($search) ? "&search=".$search : null; $param .= (!empty($_GET['page']) && $show == 'all' && permission_exists('user_log_all')) ? "&show=all" : null; $page = !empty($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 0; diff --git a/app/event_guard/event_guard_logs.php b/app/event_guard/event_guard_logs.php index d2cb196070..3dcbfbbd65 100644 --- a/app/event_guard/event_guard_logs.php +++ b/app/event_guard/event_guard_logs.php @@ -110,7 +110,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = !empty($search) ? "&search=".$search : null; $page = !empty($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 0; list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index 6a1b23ff72..c3f7e2134f 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -126,7 +126,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".$search; if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('extension_all')) { $param .= "&show=all"; diff --git a/app/fax/fax_files.php b/app/fax/fax_files.php index 22a2040b15..22066507a7 100644 --- a/app/fax/fax_files.php +++ b/app/fax/fax_files.php @@ -241,7 +241,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&id=".$fax_uuid."&box=".$_GET['box'].(!empty($_GET['order_by']) ? "&order_by=".$_GET['order_by'] : null).(!empty($_GET['order']) ? "&order=".$_GET['order'] : null); $page = !empty($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 0; list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); diff --git a/app/fax/fax_logs.php b/app/fax/fax_logs.php index 7560845a50..841f088222 100644 --- a/app/fax/fax_logs.php +++ b/app/fax/fax_logs.php @@ -95,7 +95,7 @@ $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&id=".$fax_uuid."&order_by=".$order_by."&order=".$order."&search=".$search; if (isset($_GET['page'])) { $page = is_numeric($_GET['page']) ? $_GET['page'] : 0; diff --git a/app/fifo/fifo.php b/app/fifo/fifo.php index 53f2ed7dc3..9d2c510b75 100644 --- a/app/fifo/fifo.php +++ b/app/fifo/fifo.php @@ -132,7 +132,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = !empty($search) ? "&search=".$search : null; $param .= (!empty($_GET['page']) && $show == 'all' && permission_exists('fifo_all')) ? "&show=all" : null; $page = !empty($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 0; diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index 1f0bd727c3..cb9d02729b 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -146,7 +146,7 @@ $num_rows = $total_gateways; //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".$search; $param .= $order_by ? "&order_by=".$order_by."&order=".$order : null; $page = !empty($_GET['page']) ? $_GET['page'] : 0; diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index df01fbf03f..25154dc255 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -109,7 +109,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".urlencode($search); if ($show == "all" && permission_exists('phrase_all')) { $param .= "&show=all"; diff --git a/app/pin_numbers/pin_numbers.php b/app/pin_numbers/pin_numbers.php index a2aaba0af9..bc55cdcefc 100644 --- a/app/pin_numbers/pin_numbers.php +++ b/app/pin_numbers/pin_numbers.php @@ -101,7 +101,7 @@ $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = "&search=".$search; $page = is_numeric($_GET['page']) ? $_GET['page'] : 0; list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index d46f228159..564db7f5ed 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -128,7 +128,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = $search ? "&search=".$search : null; $param = ($show == "all" && permission_exists('ring_group_all')) ? "&show=all" : null; $page = isset($_GET['page']) ? $_GET['page'] : 0; diff --git a/app/sofia_global_settings/sofia_global_settings.php b/app/sofia_global_settings/sofia_global_settings.php index 537b15be04..d9b89df7eb 100644 --- a/app/sofia_global_settings/sofia_global_settings.php +++ b/app/sofia_global_settings/sofia_global_settings.php @@ -107,7 +107,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = !empty($search) ? "&search=".$search : null; $page = !empty($_GET['page']) ? $_GET['page'] : 0; list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php index 23eb0b57ee..4303d74f4d 100644 --- a/app/time_conditions/time_conditions.php +++ b/app/time_conditions/time_conditions.php @@ -112,7 +112,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page data - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = $search ? "&search=".urlencode($search) : null; if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('time_condition_all')) { $param .= "&show=all"; diff --git a/app/vars/vars.php b/app/vars/vars.php index cc97607fa8..305fc7bef3 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -105,7 +105,7 @@ $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = $search ? "&search=".$search : null; $param = $order_by ? "&order_by=".$order_by."&order=".$order : null; $page = empty($_GET['page']) ? $page = 0 : $page = $_GET['page']; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 2c749db521..c0bc73a120 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -179,7 +179,7 @@ require_once "resources/header.php"; //xml cdr include - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); require_once "xml_cdr_inc.php"; //javascript function: send_cmd diff --git a/app/xml_cdr/xml_cdr_export.php b/app/xml_cdr/xml_cdr_export.php index e0c3938819..83a4af48da 100644 --- a/app/xml_cdr/xml_cdr_export.php +++ b/app/xml_cdr/xml_cdr_export.php @@ -42,7 +42,7 @@ $text = $language->get(); //additional includes - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $archive_request = isset($_POST['archive_request']) && $_POST['archive_request'] == 'true' ? true : false; require_once "xml_cdr_inc.php"; diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index a5a571dfa2..50ad1bfb77 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -285,7 +285,7 @@ //$rows_per_page = $_SESSION['domain']['paging']['numeric']; //prepare to page the results - //$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; //set on the page that includes this page + //$rows_per_page = $settings->get('domain', 'paging', 50); //set on the page that includes this page if (empty($_GET['page']) || (!empty($_GET['page']) && !is_numeric($_GET['page']))) { $_GET['page'] = 0; } diff --git a/core/groups/groups.php b/core/groups/groups.php index a0b1629c14..1c220033fa 100644 --- a/core/groups/groups.php +++ b/core/groups/groups.php @@ -110,7 +110,7 @@ $num_rows = $database->select($sql, $parameters ?? '', 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = $search ? "&search=".$search : null; $param = ($show == 'all' && permission_exists('group_all')) ? "&show=all" : null; $page = !empty($_GET['page']) ? $_GET['page'] : 0; diff --git a/core/user_logs/user_logs.php b/core/user_logs/user_logs.php index c589e72662..30fd52e111 100644 --- a/core/user_logs/user_logs.php +++ b/core/user_logs/user_logs.php @@ -130,7 +130,7 @@ unset($sql, $parameters); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = !empty($search) ? "&search=".$search : null; $param .= (!empty($_GET['page']) && $show == 'all' && permission_exists('user_log_all')) ? "&show=all" : null; $page = !empty($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 0; diff --git a/core/users/users.php b/core/users/users.php index 05d5056762..e9da994040 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -129,7 +129,7 @@ $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results - $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; + $rows_per_page = $settings->get('domain', 'paging', 50); $param = $search ? "&search=".$search : null; $param .= ($show == 'all' && permission_exists('user_all')) ? "&show=all" : null; $page = !empty($_GET['page']) ? $_GET['page'] : 0;