diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php index 560c520824..10cc5b0577 100644 --- a/app/access_controls/access_control_edit.php +++ b/app/access_controls/access_control_edit.php @@ -120,18 +120,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/header.php"; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo " "; - echo "
\n"; - echo "
"; - echo "
\n"; - echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; @@ -188,21 +181,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo " \n"; } - echo " \n"; + echo "
\n"; echo " \n"; echo " "; echo "
".$text['title-access_control']."\n"; + echo "".$text['title-access_control']."

\n"; echo " "; echo " "; echo "
"; echo ""; + echo "

"; if ($action == "update") { require "access_control_nodes.php"; + echo "

"; } - echo "
"; - echo "
"; - //include the footer require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/app/access_controls/access_control_node_edit.php b/app/access_controls/access_control_node_edit.php index 42940de0f3..e674316af7 100644 --- a/app/access_controls/access_control_node_edit.php +++ b/app/access_controls/access_control_node_edit.php @@ -134,18 +134,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/header.php"; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo " "; - echo "
\n"; - echo "
"; echo "
\n"; - echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; @@ -214,16 +208,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo " \n"; } - echo " \n"; + echo "
\n"; echo " \n"; echo " "; echo "
".$text['title-access_control_node']."\n"; + echo "".$text['title-access_control_node']."

\n"; echo " "; echo " "; echo "
"; echo ""; - - echo "
"; - echo "
"; + echo "

"; //include the footer require_once "resources/footer.php"; diff --git a/app/access_controls/access_control_nodes.php b/app/access_controls/access_control_nodes.php index 8eb67b69e1..e05a89139d 100644 --- a/app/access_controls/access_control_nodes.php +++ b/app/access_controls/access_control_nodes.php @@ -23,11 +23,6 @@ else { require_once "resources/paging.php"; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo ""; - echo "
\n"; - echo "
"; echo "\n"; echo " \n"; @@ -53,7 +48,7 @@ else { } //prepare to page the results - $rows_per_page = 1000; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } @@ -75,7 +70,6 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "
\n"; echo "\n"; echo th_order_by('node_type', $text['label-node_type'], $order_by, $order); @@ -136,13 +130,6 @@ else { echo "\n"; echo "
"; - echo ""; - echo "

"; - - echo "
"; - echo "
"; echo "

"; //include the footer diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php index 91d963650c..f2a8cc6938 100644 --- a/app/access_controls/access_controls.php +++ b/app/access_controls/access_controls.php @@ -23,12 +23,6 @@ else { require_once "resources/paging.php"; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo "
\n"; - echo "
"; - echo "\n"; echo " \n"; echo " \n"; @@ -57,7 +51,7 @@ else { } //prepare to page the results - $rows_per_page = 10; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } @@ -78,7 +72,6 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "
".$text['title-access_controls']."
\n"; echo "\n"; echo th_order_by('access_control_name', $text['label-access_control_name'], $order_by, $order); @@ -132,18 +125,11 @@ else { } echo " \n"; echo " \n"; - echo "
\n"; + echo "
\n"; + echo "\n"; echo "\n"; - echo ""; - echo "
"; - echo "

"; - - echo ""; - echo ""; - echo ""; - echo ""; echo "

"; //include the footer diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php index b314f7345b..517b006bd1 100644 --- a/app/call_block/call_block.php +++ b/app/call_block/call_block.php @@ -80,7 +80,7 @@ require_once "resources/require.php"; } //prepare to page the results - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index ea93f9581b..1dc1b9ea7e 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -62,7 +62,7 @@ else { $num_rows = count($result); unset ($prep_statement, $result, $sql); - $rows_per_page = 10; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php index 3041391e16..68cd87ad37 100644 --- a/app/call_broadcast/call_broadcast_send.php +++ b/app/call_broadcast/call_broadcast_send.php @@ -242,7 +242,7 @@ require_once "resources/header.php"; echo "
"; echo "\n"; - echo "\n"; + echo "\n"; echo "
\n"; echo "
"; diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index b5d596e50a..48a2249f58 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -69,7 +69,7 @@ else { $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $num_rows = count($result); unset ($prep_statement, $result, $sql); - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php index a5d8a29729..3cda98e46a 100644 --- a/app/call_centers/call_center_agents.php +++ b/app/call_centers/call_center_agents.php @@ -77,7 +77,7 @@ else { $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $num_rows = count($result); unset ($prep_statement, $result, $sql); - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php index 1581050b78..954663c257 100644 --- a/app/call_centers/call_center_queues.php +++ b/app/call_centers/call_center_queues.php @@ -86,7 +86,7 @@ else { $num_rows = count($result); unset ($prep_statement, $result, $sql); - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php index e1de399800..7b390b323e 100644 --- a/app/call_flows/call_flows.php +++ b/app/call_flows/call_flows.php @@ -77,7 +77,7 @@ require_once "resources/paging.php"; } //prepare to page the results - $rows_per_page = 10; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/calls/calls.php b/app/calls/calls.php index 052739896f..a191654d94 100644 --- a/app/calls/calls.php +++ b/app/calls/calls.php @@ -91,7 +91,7 @@ else { } } else { - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; } $param = "&search=".$search; $page = $_GET['page']; @@ -102,6 +102,7 @@ else { //rework select data query $sql = str_replace('count(extension_uuid) as count', '*', $sql); + $sql .= ' order by cast(extension as int) asc'; $sql .= " limit ".$rows_per_page." offset ".$offset." "; //execute select data query diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 742819ac03..f431ee034c 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -95,7 +95,7 @@ else { } //prepare to page the results - $rows_per_page = 10; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index bff28dbb52..9e41328409 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -175,7 +175,7 @@ else { $row_count = $conference_center->room_count(); //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = check_str($_GET['page']); if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php index 1ed402ab62..2935c20a91 100644 --- a/app/conference_centers/conference_session_details.php +++ b/app/conference_centers/conference_session_details.php @@ -127,7 +127,7 @@ else { } //prepare to page the results - $rows_per_page = 500; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php index 4c669ac46a..e73f980b74 100644 --- a/app/conference_centers/conference_sessions.php +++ b/app/conference_centers/conference_sessions.php @@ -81,7 +81,7 @@ else { } //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index 9595fec805..cf3ebd4a9e 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -88,7 +88,7 @@ else { } //prepare to page the results - $rows_per_page = 10; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/contacts/contact_timer.php b/app/contacts/contact_timer.php index e491771343..cf9ead4ea1 100644 --- a/app/contacts/contact_timer.php +++ b/app/contacts/contact_timer.php @@ -312,9 +312,9 @@ if (!permission_exists('contact_time_add')) { echo "access denied"; exit; } }); setTimeout(ajax_get, refresh); }; - + ajax_get(); - + }); //set window title to time when timer is running @@ -350,11 +350,11 @@ if (!permission_exists('contact_time_add')) { echo "access denied"; exit; }

- + - + - +
diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index f48d8f2ae3..1c5ba73684 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -166,7 +166,7 @@ else { } //prepare to page the results - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index 6bd8a315d0..ed537cce92 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -40,10 +40,8 @@ else { //get the http values and set them as variables $search = check_str($_GET["search"]); - if (isset($_GET["order_by"])) { - $order_by = check_str($_GET["order_by"]); - $order = check_str($_GET["order"]); - } + $order_by = check_str($_GET["order_by"]); + $order = check_str($_GET["order"]); //includes and title require_once "resources/header.php"; @@ -82,7 +80,7 @@ else { } //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = "&search=".$search; if ($_GET['showall'] && permission_exists('destination_all')) { $param .= "&showall=true"; @@ -113,7 +111,17 @@ else { $sql .= " or destination_description like '%".$search."%' "; $sql .= ") "; } - if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; } + if (strlen($order_by) > 0) { + if ($order_by == 'destination_type') { + $sql .= "order by destination_type ".$order.", destination_number asc "; + } + else { + $sql .= "order by ".$order_by." ".$order." "; + } + } + else { + $sql .= "order by destination_type asc, destination_number asc "; + } $sql .= "limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php index fd4e2c8262..6159bf520a 100644 --- a/app/devices/device_profiles.php +++ b/app/devices/device_profiles.php @@ -85,7 +85,7 @@ else { } //prepare to page the results - $rows_per_page = 50; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/devices/device_settings.php b/app/devices/device_settings.php index 3ddb4c2d83..3848734134 100644 --- a/app/devices/device_settings.php +++ b/app/devices/device_settings.php @@ -77,7 +77,7 @@ require_once "resources/paging.php"; } //prepare to page the results - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/devices/devices.php b/app/devices/devices.php index dddb75c1c2..1aab17908b 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -98,7 +98,7 @@ else { } //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; if ($_GET['showall'] && permission_exists('device_all')) { $param = "&showall=true"; } else { diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php index 8f5c99ec31..eb0a117c9a 100644 --- a/app/dialplan/dialplan_edit.php +++ b/app/dialplan/dialplan_edit.php @@ -521,7 +521,7 @@ else { //display the results if ($result_count > 0) { - echo "\n"; + echo "
\n"; $x = 0; foreach($details as $group) { @@ -656,7 +656,7 @@ else { //echo " \n"; echo "\n"; //data - echo "\n"; if ($index != 999) { - echo ""; + echo ""; } //increment the value $x++; diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php index 531a38a1a5..56c6536073 100644 --- a/app/dialplan/dialplans.php +++ b/app/dialplan/dialplans.php @@ -186,7 +186,7 @@ else { } unset($prep_statement, $result); - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; if (strlen($app_uuid) > 0) { $param = "&app_uuid=".$app_uuid; } $page = $_GET['page']; diff --git a/app/edit/footer.php b/app/edit/footer.php index b11f46e5d4..45fff9c89f 100644 --- a/app/edit/footer.php +++ b/app/edit/footer.php @@ -23,19 +23,7 @@ Contributor(s): Mark J Crane */ -/* -echo "

"; -echo "
\n"; + echo "\n"; if ($element['hidden']) { $dialplan_detail_data_mod = $dialplan_detail_data; if ($dialplan_detail_type == 'bridge') { @@ -760,7 +760,7 @@ else { //end the row echo "
"; -echo ""; -echo "fusionpbx "; -echo "        "; -echo "http://fusionpbx.com"; -echo "        "; -echo "Author: Mark J. Crane "; - -echo ""; -*/ echo "
"; echo ""; echo ""; diff --git a/app/emails/emails.php b/app/emails/emails.php index f8c4ba29fe..01167495f5 100644 --- a/app/emails/emails.php +++ b/app/emails/emails.php @@ -58,7 +58,7 @@ else { if ($_REQUEST['a'] == 'resend' && permission_exists('email_resend')) { $email_uuid = check_str($_REQUEST["id"]); $resend = true; - + $msg_found = false; if ($email_uuid != '') { @@ -147,7 +147,7 @@ else { } //prepare to page the results - $rows_per_page = 50; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') { $param .= "&showall=true"; } else { diff --git a/app/exec/sql_query_db.php b/app/exec/sql_query_db.php index cd7cf8bbbd..9f8bdc62cf 100644 --- a/app/exec/sql_query_db.php +++ b/app/exec/sql_query_db.php @@ -77,7 +77,7 @@ require_once "resources/paging.php"; } //prepare to page the results - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index bb036da90d..a5daca0d81 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -40,10 +40,8 @@ else { //get the http values and set them as variables $search = check_str($_GET["search"]); - if (isset($_GET["order_by"])) { - $order_by = check_str($_GET["order_by"]); - $order = check_str($_GET["order"]); - } + $order_by = check_str($_GET["order_by"]); + $order = check_str($_GET["order"]); //handle search term $search = check_str($_GET["search"]); @@ -88,7 +86,7 @@ require_once "resources/paging.php"; unset($prep_statement, $result); //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = "&search=".$search; if (!isset($_GET['page'])) { $_GET['page'] = 0; } $_GET['page'] = check_str($_GET['page']); @@ -100,11 +98,11 @@ require_once "resources/paging.php"; $sql = "select * from v_extensions "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= $sql_mod; //add search mod from above - if (isset($order_by)) { - $sql .= "order by $order_by $order "; + if (strlen($order_by) > 0) { + $sql .= ($order_by == 'extension') ? "order by cast(extension as int) ".$order." " : "order by ".$order_by." ".$order." "; } else { - $sql .= "order by extension asc "; + $sql .= "order by cast(extension as int) asc "; } $sql .= " limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); diff --git a/app/fax/fax.php b/app/fax/fax.php index 5fb50ed436..8a937ef6cc 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -72,7 +72,7 @@ else { } unset($prep_statement, $result); - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = check_str($_GET['page']); if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/fax/fax_files.php b/app/fax/fax_files.php index cd9a80b589..88fc0f81d8 100644 --- a/app/fax/fax_files.php +++ b/app/fax/fax_files.php @@ -193,7 +193,7 @@ else { } //prepare to page the results - $rows_per_page = 50; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = "&id=".$_GET['id']."&box=".$_GET['box']."&order_by=".$_GET['order_by']."&order=".$_GET['order']; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/fax/fax_logs.php b/app/fax/fax_logs.php index ee0e270112..989a44d614 100755 --- a/app/fax/fax_logs.php +++ b/app/fax/fax_logs.php @@ -61,7 +61,7 @@ else { } //prepare to page the results - $rows_per_page = 50; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = "&id=".$fax_uuid."&order_by=".$order_by."&order=".$order; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index f517fd5354..a84dc4ed7e 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -139,7 +139,7 @@ else { $gateways = $prep_statement->fetchAll(PDO::FETCH_NAMED); unset ($prep_statement, $sql); - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = check_str($_GET['page']); if (strlen($page) == 0) { $page = 0; } diff --git a/app/ivr_menus/ivr_menu_options.php b/app/ivr_menus/ivr_menu_options.php index 962cd56593..8fdc3a1de9 100644 --- a/app/ivr_menus/ivr_menu_options.php +++ b/app/ivr_menus/ivr_menu_options.php @@ -73,7 +73,7 @@ else { unset($prep_statement, $result); //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = $_SERVER["QUERY_STRING"]; if (!isset($_GET['page'])) { $_GET['page'] = 0; } $_GET['page'] = check_str($_GET['page']); diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php index c945ec683a..609ba1bab8 100644 --- a/app/ivr_menus/ivr_menus.php +++ b/app/ivr_menus/ivr_menus.php @@ -75,7 +75,7 @@ else { $total_ivr_menus = $num_rows; //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; if (!isset($_GET['page'])) { $_GET['page'] = 0; } $_GET['page'] = check_str($_GET['page']); diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 3878266c30..d060fcc214 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -313,7 +313,7 @@ else { echo "\n"; echo "\n"; echo " \n"; - echo " \n"; echo " \n"; if (strlen($file) > 0) { - echo " \n"; echo " \n"; if (strlen($file) > 0) { - echo "
\n"; + echo " \n"; echo " ".$text['label-file-path']; echo " "; echo "\n"; @@ -376,7 +376,6 @@ else { $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - $row_style["2"] = "row_style2"; //show the default category if (permission_exists('music_on_hold_default_view')) { @@ -411,7 +410,7 @@ else { echo "
".$file.""; + echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); @@ -485,7 +484,7 @@ else { echo "
".$file.""; + echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($row['recording_filename'], PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index 3f9f98048b..13da732c5a 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -69,7 +69,7 @@ require_once "resources/check_auth.php"; $num_rows = count($result); unset ($prep_statement, $result, $sql); - $rows_per_page = 50; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 1f79be9528..e282a53c66 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -264,7 +264,7 @@ require_once "resources/check_auth.php"; $num_rows = count($result); unset ($prep_statement, $result, $sql); - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = "&order_by=".$order_by."&order=".$order; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } @@ -284,7 +284,6 @@ require_once "resources/check_auth.php"; $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - $row_style["2"] = "row_style2"; echo "\n"; echo "\n"; @@ -307,7 +306,7 @@ require_once "resources/check_auth.php"; foreach($result as $row) { //playback progress bar if (permission_exists('recording_play')) { - echo "\n"; + echo "\n"; } $tr_link = (permission_exists('recording_edit')) ? "href='recording_edit.php?id=".$row['recording_uuid']."'" : null; echo "\n"; @@ -319,7 +318,7 @@ require_once "resources/check_auth.php"; echo " \n"; } if (permission_exists('recording_play') || permission_exists('recording_download')) { - echo "
".$tmp_filesize.""; + echo " "; if (permission_exists('recording_play')) { $recording_file_path = $row['recording_filename']; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php index d68f397432..b4763157d0 100644 --- a/app/ring_groups/ring_group_forward.php +++ b/app/ring_groups/ring_group_forward.php @@ -96,7 +96,7 @@ require_once "resources/paging.php"; } } else { - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; } $param = ""; $page = $_GET['page']; diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index a6f77cd75a..425685dca0 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -83,7 +83,7 @@ require_once "resources/paging.php"; } //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/services/services.php b/app/services/services.php index dc970bf43e..0ee0262f97 100644 --- a/app/services/services.php +++ b/app/services/services.php @@ -133,7 +133,7 @@ if (strlen($_GET["a"]) > 0) { $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $num_rows = count($result); unset ($prep_statement, $result, $sql); - $rows_per_page = 10; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php index a77eeb1477..8f08d400fd 100644 --- a/app/sip_profiles/sip_profile_settings.php +++ b/app/sip_profiles/sip_profile_settings.php @@ -64,7 +64,7 @@ require_once "resources/paging.php"; } //prepare to page the results - $rows_per_page = 200; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index 193cb52f62..79e6c38c66 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -80,7 +80,7 @@ require_once "resources/paging.php"; } //prepare to page the results - $rows_per_page = 10; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php index ad1c4d423a..38be51e712 100644 --- a/app/time_conditions/time_conditions.php +++ b/app/time_conditions/time_conditions.php @@ -124,7 +124,7 @@ else { } unset($prep_statement, $result); - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; if (strlen($app_uuid) > 0) { $param = "&app_uuid=".$app_uuid; } $page = $_GET['page']; diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 865c66353a..eb511333e5 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -352,7 +352,6 @@ require_once "resources/check_auth.php"; $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - $row_style["2"] = "row_style2"; echo "\n"; echo "\n"; @@ -397,7 +396,7 @@ require_once "resources/check_auth.php"; echo " \n"; } if (permission_exists('voicemail_greeting_play') || permission_exists('voicemail_greeting_download')) { - echo "
".$tmp_filesize.""; + echo " "; if (permission_exists('voicemail_greeting_play')) { $greeting_file_path = $row['greeting_filename']; $greeting_file_name = strtolower(pathinfo($greeting_file_path, PATHINFO_BASENAME)); diff --git a/app/voicemails/app_languages.php b/app/voicemails/app_languages.php index 6df923eb75..6596ee0001 100644 --- a/app/voicemails/app_languages.php +++ b/app/voicemails/app_languages.php @@ -88,6 +88,20 @@ $text['option-voicemail_file_attach']['uk'] = "Приєднати аудіофа $text['option-voicemail_file_attach']['de-at'] = "Audiodatei als Anhang"; $text['option-voicemail_file_attach']['he'] = ""; +$text['message-toggled']['en-us'] = "Toggle Completed"; +$text['message-toggled']['es-cl'] = "Alternar Completado"; +$text['message-toggled']['pt-pt'] = "Alternar Concluído"; +$text['message-toggled']['fr-fr'] = "Basculer Terminé"; +$text['message-toggled']['pt-br'] = "Alternar Concluído"; +$text['message-toggled']['pl'] = "Przegubowe Zakończony"; +$text['message-toggled']['he'] = "הושלם Toggle"; +$text['message-toggled']['uk'] = "переключити Завершений"; +$text['message-toggled']['sv-se'] = "Växla Avslutade"; +$text['message-toggled']['de-at'] = "Toggle Completed"; +$text['message-toggled']['ro'] = "Completat toggle"; +$text['message-toggled']['fa'] = ""; +$text['message-toggled']['ar-eg'] = "الانتهاء من تبديل"; + $text['message-messages_not_found']['en-us'] = "No messages found."; $text['message-messages_not_found']['es-cl'] = "No hay mensajes encontrados."; $text['message-messages_not_found']['pt-pt'] = "Nenhuma mensagem encontrada."; @@ -662,6 +676,20 @@ $text['description-caller_id_name']['uk'] = "Caller ID Ім’я"; $text['description-caller_id_name']['de-at'] = "Anruferkennung (Name)"; $text['description-caller_id_name']['he'] = ""; +$text['button-toggle']['en-us'] = "Toggle"; +$text['button-toggle']['es-cl'] = "Palanca"; +$text['button-toggle']['pt-pt'] = "Alternar"; +$text['button-toggle']['fr-fr'] = "Basculer"; +$text['button-toggle']['pt-br'] = "Alternar"; +$text['button-toggle']['pl'] = "Przełącznik"; +$text['button-toggle']['he'] = "לְמַתֵג"; +$text['button-toggle']['uk'] = "тумблер"; +$text['button-toggle']['sv-se'] = "toggle"; +$text['button-toggle']['de-at'] = "Umschalten"; +$text['button-toggle']['ro'] = "Comutare"; +$text['button-toggle']['fa'] = ""; +$text['button-toggle']['ar-eg'] = "تبديل"; + $text['button-settings']['en-us'] = "Settings"; $text['button-settings']['es-cl'] = "Configuraciones"; $text['button-settings']['pt-pt'] = "Definições"; diff --git a/app/voicemails/resources/classes/voicemail.php b/app/voicemails/resources/classes/voicemail.php index cf58435c80..4b25157061 100644 --- a/app/voicemails/resources/classes/voicemail.php +++ b/app/voicemails/resources/classes/voicemail.php @@ -250,11 +250,11 @@ public function message_waiting() { //send the message waiting status - $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); - if ($fp) { - $switch_cmd .= "luarun app.lua voicemail mwi ".$this->voicemail_id."@".$_SESSION['domain_name']; - $switch_result = event_socket_request($fp, 'api '.$switch_cmd); - } + $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); + if ($fp) { + $switch_cmd .= "luarun app.lua voicemail mwi ".$this->voicemail_id."@".$_SESSION['domain_name']; + $switch_result = event_socket_request($fp, 'api '.$switch_cmd); + } } public function message_delete() { @@ -300,13 +300,54 @@ $this->message_waiting(); } + public function message_toggle() { + //get the voicemail_id + if (!isset($this->voicemail_id)) { + $sql = "select voicemail_id from v_voicemails "; + $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; + $sql .= "and voicemail_uuid = '".$this->voicemail_uuid."' "; + $prep_statement = $this->db->prepare(check_sql($sql)); + $prep_statement->execute(); + $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); + foreach ($result as &$row) { + $this->voicemail_id = $row["voicemail_id"]; + } + unset ($prep_statement); + } + + //get message status + $sql = "select message_status from v_voicemail_messages "; + $sql .= "where domain_uuid = '".$this->domain_uuid."' "; + $sql .= "and voicemail_uuid = '".$this->voicemail_uuid."' "; + $sql .= "and voicemail_message_uuid = '".$this->voicemail_message_uuid."' "; + $prep_statement = $this->db->prepare(check_sql($sql)); + $prep_statement->execute(); + $row = $prep_statement->fetch(PDO::FETCH_NAMED); + $new_status = ($row['message_status'] == 'saved') ? 'null' : "'saved'"; + unset($sql, $prep_statement, $row); + + //set message status + $sql = "update v_voicemail_messages set "; + $sql .= "message_status = ".$new_status." "; + $sql .= "where domain_uuid = '".$this->domain_uuid."' "; + $sql .= "and voicemail_uuid = '".$this->voicemail_uuid."' "; + $sql .= "and voicemail_message_uuid = '".$this->voicemail_message_uuid."' "; + $prep_statement = $this->db->prepare(check_sql($sql)); + $prep_statement->execute(); + unset($sql, $prep_statement); + + //check the message waiting status + $this->message_waiting(); + } + + public function message_saved() { //set the voicemail status to saved $sql = "update v_voicemail_messages set "; $sql .= "message_status = 'saved' "; - $sql .= "where domain_uuid = '$this->domain_uuid' "; - $sql .= "and voicemail_uuid = '$this->voicemail_uuid' "; - $sql .= "and voicemail_message_uuid = '$this->voicemail_message_uuid'"; + $sql .= "where domain_uuid = '".$this->domain_uuid."' "; + $sql .= "and voicemail_uuid = '".$this->voicemail_uuid."' "; + $sql .= "and voicemail_message_uuid = '".$this->voicemail_message_uuid."' "; $prep_statement = $this->db->prepare(check_sql($sql)); $prep_statement->execute(); unset($sql, $prep_statement); diff --git a/app/voicemails/voicemail_message_toggle.php b/app/voicemails/voicemail_message_toggle.php new file mode 100644 index 0000000000..8dd367eb5f --- /dev/null +++ b/app/voicemails/voicemail_message_toggle.php @@ -0,0 +1,78 @@ + + Portions created by the Initial Developer are Copyright (C) 2008-2012 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ +require_once "root.php"; +require_once "resources/require.php"; +require_once "resources/check_auth.php"; +if (permission_exists('voicemail_message_view')) { + //access granted +} +else { + echo "access denied"; + exit; +} + +//add multi-lingual support + $language = new text; + $text = $language->get(); + +//get submitted variables + $voicemail_messages = $_REQUEST["voicemail_messages"]; + +//toggle the voicemail message + $toggled = 0; + if (is_array($voicemail_messages) && sizeof($voicemail_messages) > 0) { + require_once "resources/classes/voicemail.php"; + foreach ($voicemail_messages as $voicemail_uuid => $voicemail_message_uuids) { + foreach ($voicemail_message_uuids as $voicemail_message_uuid) { + $voicemail = new voicemail; + $voicemail->db = $db; + $voicemail->domain_uuid = $_SESSION['domain_uuid']; + $voicemail->voicemail_uuid = check_str($voicemail_uuid); + $voicemail->voicemail_message_uuid = check_str($voicemail_message_uuid); + $result = $voicemail->message_toggle(); + unset($voicemail); + $toggled++; + } + } + } + +//set the referrer + $http_referer = parse_url($_SERVER["HTTP_REFERER"]); + $referer_path = $http_referer['path']; + $referer_query = $http_referer['query']; + +//redirect the user + if ($toggled > 0) { + $_SESSION["message"] = $text['message-toggled'].': '.$toggled; + } + if ($referer_path == PROJECT_PATH."/app/voicemails/voicemail_messages.php") { + header("Location: voicemail_messages.php?".$referer_query); + } + else { + header("Location: voicemails.php"); + } + +?> \ No newline at end of file diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php index d07d86d41c..7e389eba45 100644 --- a/app/voicemails/voicemail_messages.php +++ b/app/voicemails/voicemail_messages.php @@ -93,12 +93,11 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - $row_style["2"] = "row_style2"; //loop through the voicemail messages if (count($voicemails) > 0) { - echo "
\n"; + echo "\n"; echo "
"; echo "\n"; @@ -113,11 +112,12 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] echo " ".$text['label-mailbox'].": ".$field['voicemail_id']."
 \n"; echo " \n"; echo " \n"; @@ -139,7 +139,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] } if (permission_exists('voicemail_message_delete')) { echo ""; } echo "\n"; @@ -164,7 +164,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] echo " \n"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index 349a391743..5fdc12a912 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -38,6 +38,10 @@ else { $language = new text; $text = $language->get(); +//retrieve order by + $order_by = check_str($_GET["order_by"]); + $order = check_str($_GET["order"]); + //set the voicemail id and voicemail uuid arrays foreach ($_SESSION['user']['extension'] as $index => $row) { if (strlen($row['number_alias']) > 0) { @@ -101,10 +105,9 @@ else { } //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; if ($search != '') { $param .= "&search=".$search; } - if ($order_by != '') { $param .= "&order_by=".$order_by."&order=".$order; } $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); @@ -112,7 +115,12 @@ else { //get the list $sql = str_replace('count(*) as num_rows', '*', $sql); - $sql .= ($order_by != '') ? "order by ".$order_by." ".$order." " : "order by voicemail_id asc "; + if (strlen($order_by) > 0) { + $sql .= ($order_by == 'voicemail_id') ? "order by cast(voicemail_id as int) ".$order." " : "order by ".$order_by." ".$order." "; + } + else { + $sql .= "order by cast(voicemail_id as int) asc "; + } $sql .= "limit ".$rows_per_page." offset ".$offset." "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index e47a3dcc0d..8c48c7c77f 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -44,7 +44,7 @@ else { require_once "resources/paging.php"; //xml cdr include - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; require_once "xml_cdr_inc.php"; //javascript function: send_cmd @@ -461,7 +461,7 @@ else { //recording playback if (permission_exists('recording_play') && $recording_file_path != '') { - echo "\n"; + echo "\n"; } if (if_group("admin") || if_group("superadmin") || if_group("cdr")) { @@ -529,7 +529,7 @@ else { //recording if (permission_exists('recording_play') || permission_exists('recording_download')) { if ($recording_file_path != '') { - echo "
\n"; + echo " \n"; if (permission_exists('voicemail_greeting_view')) { - echo " \n"; + echo " \n"; } if (permission_exists('voicemail_edit')) { - echo " \n"; + echo " \n"; } echo "

"; echo " 		"; - echo "".$v_link_label_delete.""; + echo "".$v_link_label_delete.""; echo "
".$row['created_date']."".$row['caller_id_name']." ".$row['caller_id_number']." "; + echo " "; $recording_file_path = $file; $recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME)); $recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION); @@ -174,7 +174,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"] case "ogg" : $recording_type = "audio/ogg"; break; } echo ""; - echo "".$v_link_label_play.""; + echo "".$v_link_label_play.""; echo "".$v_link_label_download.""; echo " ".$row['message_length_label']." 
"; + echo " "; if (permission_exists('recording_play')) { echo ""; echo "".$v_link_label_play.""; diff --git a/app/xml_cdr/xml_cdr_export.php b/app/xml_cdr/xml_cdr_export.php index 9b403d8655..48a5909ff8 100644 --- a/app/xml_cdr/xml_cdr_export.php +++ b/app/xml_cdr/xml_cdr_export.php @@ -39,7 +39,7 @@ else { $text = $language->get(); //additional includes - $rows_per_page = 0; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; require_once "xml_cdr_inc.php"; //get the format diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index 13a6cc72e9..24507e7349 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -292,12 +292,15 @@ else { if ($num_rows > $_SESSION['cdr']['limit']['numeric']) { $num_rows = $_SESSION['cdr']['limit']['numeric']; } - if ($rows_per_page > $_SESSION['cdr']['limit']['numeric']) { - $rows_per_page = $_SESSION['cdr']['limit']['numeric']; + if ($_SESSION['domain']['paging']['numeric'] != '' && $rows_per_page > $_SESSION['domain']['paging']['numeric']) { + $rows_per_page = $_SESSION['domain']['paging']['numeric']; + } + else { + $rows_per_page = 50; } //prepare to page the results - //$rows_per_page = 150; //set on the page that includes this page + //$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; //set on the page that includes this page $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls_mini, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page, true); //top @@ -362,6 +365,5 @@ else { $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - $row_style["2"] = "row_style2"; ?> \ No newline at end of file diff --git a/core/databases/databases.php b/core/databases/databases.php index 7b20efef17..71ee35c79f 100644 --- a/core/databases/databases.php +++ b/core/databases/databases.php @@ -76,7 +76,7 @@ else { } //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php index 73dffd1b4e..6aad1b8563 100644 --- a/core/default_settings/app_defaults.php +++ b/core/default_settings/app_defaults.php @@ -50,6 +50,13 @@ if ($domains_processed == 1) { $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_description'] = 'outbound,loopback,lcr'; $x++; + $array[$x]['default_setting_category'] = 'domain'; + $array[$x]['default_setting_subcategory'] = 'paging'; + $array[$x]['default_setting_name'] = 'numeric'; + $array[$x]['default_setting_value'] = '100'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the maximum number of records displayed per page. (Default: 50)'; + $x++; $array[$x]['default_setting_category'] = 'security'; $array[$x]['default_setting_subcategory'] = 'password_length'; $array[$x]['default_setting_name'] = 'var'; diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 5a22f3a132..a5ba7d4bdd 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -445,36 +445,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " \n"; } - elseif ( - $category == "theme" && $subcategory == "body_color" && $name == "text" || - $category == "theme" && $subcategory == "body_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "background_color" && $name == "array" || - $category == "theme" && $subcategory == "login_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "login_background_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_background_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "footer_color" && $name == "text" || - $category == "theme" && $subcategory == "footer_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_default_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_default_color" && $name == "text" || - $category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_negative_color" && $name == "text" || - $category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_alert_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text" - ) { + elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { echo " \n"; } elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) { diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index abb690c44c..2b5e39b356 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -417,6 +417,14 @@ else { echo " ".str_repeat('*', strlen($row['default_setting_value'])); } else { + if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { + $border = ( + substr_count(strtolower($row['default_setting_value']), '#fff') > 0 || + substr_count(strtolower($row['default_setting_value']), '#ffffff') > 0 || + substr_count(str_replace(' ','',strtolower($row['default_setting_value'])), '255,255,255,') > 0 + ) ? "border: 1px solid #ccc; padding: -1px;" : null; + echo " "; + } echo " ".htmlspecialchars($row['default_setting_value']); } echo "  \n"; diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index f631f4c3b0..cddefb7790 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -542,36 +542,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " \n"; } - elseif ( - $category == "theme" && $subcategory == "body_color" && $name == "text" || - $category == "theme" && $subcategory == "body_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "background_color" && $name == "array" || - $category == "theme" && $subcategory == "login_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "login_background_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_background_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "footer_color" && $name == "text" || - $category == "theme" && $subcategory == "footer_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_default_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_default_color" && $name == "text" || - $category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_negative_color" && $name == "text" || - $category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_alert_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text" - ) { + elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { echo " \n"; } elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) { diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 63387cc7b3..1a3cb87425 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -115,7 +115,7 @@ if (sizeof($_REQUEST) > 1) { } //prepare to page the results - $rows_per_page = 200; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 200; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } @@ -240,12 +240,20 @@ if (sizeof($_REQUEST) > 1) { ( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) || ( $category == "theme" && $subcategory == "logo_align" && $name == "text" ) ) { - echo " ".$text['label-'.$row['default_setting_value']]; + echo " ".$text['label-'.$row['domain_setting_value']]; } else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " ".str_repeat('*', strlen($row['domain_setting_value'])); } else { + if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { + $border = ( + substr_count(strtolower($row['domain_setting_value']), '#fff') > 0 || + substr_count(strtolower($row['domain_setting_value']), '#ffffff') > 0 || + substr_count(str_replace(' ','',strtolower($row['domain_setting_value'])), '255,255,255,') > 0 + ) ? "border: 1px solid #ccc; padding: -1px;" : null; + echo " "; + } echo " ".htmlspecialchars($row['domain_setting_value']); } echo "  \n"; diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 792cf4faa9..8af8a22185 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -132,7 +132,7 @@ require_once "resources/check_auth.php"; } //prepare to page the results - $rows_per_page = 100; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/core/menu/menu.php b/core/menu/menu.php index fa3ccceaec..9d647732b8 100644 --- a/core/menu/menu.php +++ b/core/menu/menu.php @@ -75,7 +75,7 @@ else { } //prepare to page the results - $rows_per_page = 150; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php index 0ec6e646b0..ebcfe99614 100644 --- a/core/users/user_setting_edit.php +++ b/core/users/user_setting_edit.php @@ -544,36 +544,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " \n"; } - elseif ( - $category == "theme" && $subcategory == "body_color" && $name == "text" || - $category == "theme" && $subcategory == "body_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "background_color" && $name == "array" || - $category == "theme" && $subcategory == "login_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "login_background_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_background_color" && $name == "text" || - $category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "footer_color" && $name == "text" || - $category == "theme" && $subcategory == "footer_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_default_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_default_color" && $name == "text" || - $category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_negative_color" && $name == "text" || - $category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" || - $category == "theme" && $subcategory == "message_alert_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" || - $category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" || - $category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text" - ) { + elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { echo " \n"; } elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) { diff --git a/core/users/user_settings.php b/core/users/user_settings.php index ec81d880b2..b7f1e46f5f 100644 --- a/core/users/user_settings.php +++ b/core/users/user_settings.php @@ -82,7 +82,7 @@ else { } //prepare to page the results - $rows_per_page = 200; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 100; $param = ""; $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } @@ -211,12 +211,20 @@ else { ( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) || ( $category == "theme" && $subcategory == "logo_align" && $name == "text" ) ) { - echo " ".$text['label-'.$row['default_setting_value']]; + echo " ".$text['label-'.$row['user_setting_value']]; } else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " ".str_repeat('*', strlen($row['user_setting_value'])); } else { + if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { + $border = ( + substr_count(strtolower($row['user_setting_value']), '#fff') > 0 || + substr_count(strtolower($row['user_setting_value']), '#ffffff') > 0 || + substr_count(str_replace(' ','',strtolower($row['user_setting_value'])), '255,255,255,') > 0 + ) ? "border: 1px solid #ccc; padding: -1px;" : null; + echo " "; + } echo " ".htmlspecialchars($row['user_setting_value']); } echo "  \n"; diff --git a/core/users/users.php b/core/users/users.php index e3fe2d73c8..304508b86d 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -103,7 +103,7 @@ else { } } unset ($prep_statement, $result, $sql); - $rows_per_page = 200; + $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $param = "search=".$search_value; if (permission_exists('user_all') && $_GET['showall'] == 'true') { $param .= "&showall=true"; diff --git a/resources/paging.php b/resources/paging.php index 8a747460c5..0c313c5189 100644 --- a/resources/paging.php +++ b/resources/paging.php @@ -27,7 +27,7 @@ function paging($num_rows, $param, $rows_per_page, $mini = false) { if (strlen($rows_per_page)==0) { - $rows_per_page = "5"; //default number of rows per page + $rows_per_page = 50; //default number of rows per page } diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php index 1f648e5a69..06f2f83833 100644 --- a/themes/default/app_defaults.php +++ b/themes/default/app_defaults.php @@ -302,6 +302,147 @@ if ($domains_processed == 1) { $array[$x]['default_setting_value'] = '#69e5ff'; $array[$x]['default_setting_enabled'] = 'false'; $array[$x]['default_setting_description'] = 'Set the hover text color (and opacity) of sub menu items.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'heading_text_font'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = 'arial'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the font of the page heading text.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'heading_text_size'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '15px'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the size of the page heading text.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'heading_text_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#952424'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the color (and opacity) of the page heading text.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'body_text_font'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = 'arial'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the font of body text.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'body_text_size'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '12px'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the size of the body text.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'body_text_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#5f5f5f'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the color (and opacity) of the body text.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'text_link_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#004083'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the link color (and opacity) of text links outside tables.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'text_link_color_hover'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#5082ca'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the hover color (and opacity) of text links outside tables.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_heading_text_font'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = 'arial'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the text font of table header rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_heading_text_size'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '12px'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the text size of table header rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_heading_text_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#3164ad'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the text color (and opacity) of table header rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_heading_background_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = 'none'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the background color (and opacity) of table header rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_heading_border_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#a4aebf'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the bottom border color (and opacity) of table header rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_row_text_font'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = 'arial'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the text font of table data rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_row_text_size'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '12px'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the text size of table data rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_row_text_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#000'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the text color (and opacity) of table data rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_row_background_color_dark'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#e5e9f0'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the darker background color (and opacity) of table data rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_row_background_color_medium'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#f0f2f6'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the medium background color (and opacity) of table data rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_row_background_color_light'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#fff'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the lighter background color (and opacity) of table data rows.'; + $x++; + $array[$x]['default_setting_category'] = 'theme'; + $array[$x]['default_setting_subcategory'] = 'table_row_border_color'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '#c5d1e5'; + $array[$x]['default_setting_enabled'] = 'false'; + $array[$x]['default_setting_description'] = 'Set the bottom border (dividing line) color (and opacity) of table data rows.'; + //get an array of the default settings $sql = "select * from v_default_settings "; diff --git a/themes/default/config.php b/themes/default/config.php index d849837143..e71a0851ab 100644 --- a/themes/default/config.php +++ b/themes/default/config.php @@ -1,12 +1,12 @@ "; - $v_link_label_add = ""; - $v_link_label_delete = ""; - $v_link_label_view = ""; - $v_link_label_play = ""; - $v_link_label_pause = ""; - $v_link_label_download = ""; + $v_link_label_edit = ""; + $v_link_label_add = ""; + $v_link_label_delete = ""; + $v_link_label_view = ""; + $v_link_label_play = ""; + $v_link_label_pause = ""; + $v_link_label_download = ""; ?> diff --git a/themes/default/images/icon_add.png b/themes/default/images/icon_add.png deleted file mode 100644 index 5715569041..0000000000 Binary files a/themes/default/images/icon_add.png and /dev/null differ diff --git a/themes/default/images/icon_delete.png b/themes/default/images/icon_delete.png deleted file mode 100644 index a77161f734..0000000000 Binary files a/themes/default/images/icon_delete.png and /dev/null differ diff --git a/themes/default/images/icon_download.png b/themes/default/images/icon_download.png deleted file mode 100644 index 931554ec64..0000000000 Binary files a/themes/default/images/icon_download.png and /dev/null differ diff --git a/themes/default/images/icon_edit.png b/themes/default/images/icon_edit.png deleted file mode 100644 index 93e573bbe7..0000000000 Binary files a/themes/default/images/icon_edit.png and /dev/null differ diff --git a/themes/default/images/icon_pause.png b/themes/default/images/icon_pause.png deleted file mode 100644 index c3aea46eb5..0000000000 Binary files a/themes/default/images/icon_pause.png and /dev/null differ diff --git a/themes/default/images/icon_play.png b/themes/default/images/icon_play.png deleted file mode 100644 index 915d58986d..0000000000 Binary files a/themes/default/images/icon_play.png and /dev/null differ diff --git a/themes/default/images/icon_view.png b/themes/default/images/icon_view.png deleted file mode 100644 index 0d8df9f1f1..0000000000 Binary files a/themes/default/images/icon_view.png and /dev/null differ diff --git a/themes/default/template.php b/themes/default/template.php index 7adfa9918b..c0c117b245 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -154,6 +154,11 @@