diff --git a/app/calls/calls.php b/app/calls/calls.php index 44c895082e..f8777e1b84 100644 --- a/app/calls/calls.php +++ b/app/calls/calls.php @@ -150,7 +150,7 @@ else { if ($result_count > 0) { foreach($result as $row) { $tr_url = PROJECT_PATH."/app/calls/call_edit.php?id=".$row['extension_uuid']; - $tr_link = (permission_exists('call_forward') || permission_exists('follow_me') || permission_exists('do_not_disturb')) ? " onclick=\"document.location.href='".$tr_url."';\"" : null; + $tr_link = (permission_exists('call_forward') || permission_exists('follow_me') || permission_exists('do_not_disturb')) ? "href='".$tr_url."'" : null; echo "\n"; echo " ".$row['extension']."\n"; echo " \n"; diff --git a/app/content/rsslist.php b/app/content/rsslist.php index 8597dd4d88..fafa601019 100644 --- a/app/content/rsslist.php +++ b/app/content/rsslist.php @@ -96,7 +96,7 @@ $order = $_GET["order"]; echo th_order_by('rss_link', $text['label-link'], $order_by, $order); //echo th_order_by('rss_sub_category', 'Template', $order_by, $order); echo th_order_by('rss_group', $text['label-group'], $order_by, $order); - echo th_order_by('rss_order', $text['label-order'], $order_by, $order); + echo th_order_by('rss_order', $text['label-order'], $order_by, $order, '', "style='text-align: center;'"); if ($result_count == 0) { //no results echo "\n"; } @@ -110,8 +110,8 @@ $order = $_GET["order"]; if ($result_count > 0) { foreach($result as $row) { //print_r( $row ); - $tr_link = " onclick=\"document.location.href='rssupdate.php?rss_uuid=".$row[rss_uuid]."';\""; - echo "\n"; + $tr_link = "href='rssupdate.php?rss_uuid=".$row[rss_uuid]."'"; + echo "\n"; //echo "".$row[rss_uuid].""; //echo "".$row[rss_category].""; @@ -141,7 +141,7 @@ $order = $_GET["order"]; //echo "".$row[rss_optional_3].""; //echo "".$row[rss_optional_4].""; //echo "".$row[rss_optional_5].""; - echo "".$row[rss_order].""; + echo "".$row[rss_order].""; //echo ""; //echo " "; diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index 4244223816..23ef80dbb3 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -134,7 +134,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('destination_type', $text['label-destination_type'], $order_by, $order); echo th_order_by('destination_number', $text['label-destination_number'], $order_by, $order); @@ -144,10 +144,10 @@ require_once "resources/paging.php"; echo "\n"; - echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = "href='destination_edit.php?id=".$row['destination_uuid']."'"; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/app/devices/devices.php b/app/devices/devices.php index 73c84de8d9..141a703d9b 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -164,7 +164,7 @@ else { $device_mac_address = $row[device_mac_address]; $device_mac_address = substr($device_mac_address, 0,2).'-'.substr($device_mac_address, 2,2).'-'.substr($device_mac_address, 4,2).'-'.substr($device_mac_address, 6,2).'-'.substr($device_mac_address, 8,2).'-'.substr($device_mac_address, 10,2); - $tr_link = (permission_exists('device_edit')) ? " onclick=\"document.location.href='device_edit.php?id=".$row['device_uuid']."';\"" : null; + $tr_link = (permission_exists('device_edit')) ? "href='device_edit.php?id=".$row['device_uuid']."'" : null; echo "\n"; //echo " \n"; echo "
"; echo "$v_link_label_add"; echo "
".ucwords($row['destination_type'])."".$row['destination_number']."".$row['destination_context']."
".$row['device_uuid']." "; diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php index 718f8e3752..103c074ab7 100644 --- a/app/dialplan/dialplans.php +++ b/app/dialplan/dialplans.php @@ -189,13 +189,13 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('dialplan_name', $text['label-name'], $order_by, $order, $app_uuid); echo th_order_by('dialplan_number', $text['label-number'], $order_by, $order, $app_uuid); echo th_order_by('dialplan_context', $text['label-context'], $order_by, $order, $app_uuid); - echo th_order_by('dialplan_order', $text['label-order'], $order_by, $order, $app_uuid); - echo th_order_by('dialplan_enabled', $text['label-enabled'], $order_by, $order, $app_uuid); + echo th_order_by('dialplan_order', $text['label-order'], $order_by, $order, $app_uuid, "style='text-align: center;'"); + echo th_order_by('dialplan_enabled', $text['label-enabled'], $order_by, $order, $app_uuid, "style='text-align: center;'"); echo th_order_by('dialplan_description', $text['label-description'], $order_by, $order, $app_uuid); echo "\n"; + if ( + ($app_uuid == "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4" && permission_exists('inbound_route_edit')) || + ($app_uuid == "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3" && permission_exists('outbound_route_edit')) || + ($app_uuid == "16589224-c876-aeb3-f59f-523a1c0801f7" && permission_exists('fifo_edit')) || + ($app_uuid == "4b821450-926b-175a-af93-a03c441818b1" && permission_exists('time_condition_edit')) || + permission_exists('dialplan_edit') + ) { + $tr_link = "href='dialplan_edit.php?id=".$row['dialplan_uuid']."&app_uuid=".$app_uuid."'"; + } + echo "\n"; echo " \n"; echo " \n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; if ($num_rows > 0) { foreach($result as $row) { - $tr_link = (permission_exists('sip_profile_setting_edit')) ? " onclick=\"document.location.href='sip_profile_setting_edit.php?sip_profile_uuid=".$row['sip_profile_uuid']."&id=".$row['sip_profile_setting_uuid']."';\"" : null; + $tr_link = (permission_exists('sip_profile_setting_edit')) ? "href='sip_profile_setting_edit.php?sip_profile_uuid=".$row['sip_profile_uuid']."&id=".$row['sip_profile_setting_uuid']."'" : null; echo "\n"; echo " \n"; echo " \n"; echo " > \n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index bd15d36cf7..49dc8941a9 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -148,7 +148,7 @@ require_once "resources/paging.php"; echo "\n"; echo "\n"; } - $tr_link = (permission_exists('default_setting_edit')) ? " onclick=\"document.location.href='default_setting_edit.php?id=".$row['default_setting_uuid']."';\"" : null; + $tr_link = (permission_exists('default_setting_edit')) ? "href='default_setting_edit.php?id=".$row['default_setting_uuid']."'" : null; echo "\n"; echo " \n"; echo "\n"; } - $tr_link = (permission_exists('domain_setting_edit')) ? " onclick=\"document.location.href='domain_setting_edit.php?domain_uuid=".$row['domain_uuid']."&id=".$row['domain_setting_uuid']."';\"" : null; + $tr_link = (permission_exists('domain_setting_edit')) ? " href='domain_setting_edit.php?domain_uuid=".$row['domain_uuid']."&id=".$row['domain_setting_uuid']."'" : null; echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php index a7c7767fec..127a6038ca 100644 --- a/core/menu/menu_item_list.php +++ b/core/menu/menu_item_list.php @@ -101,7 +101,7 @@ function build_db_child_menu_list ($db, $menu_item_level, $menu_item_uuid, $c) { } //display the content of the list - $tr_link = (permission_exists('menu_edit')) ? " onclick=\"document.location.href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."&menu_item_parent_uuid=".$row2['menu_item_parent_uuid']."';\"" : null; + $tr_link = (permission_exists('menu_edit')) ? "href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."&menu_item_parent_uuid=".$row2['menu_item_parent_uuid']."'" : null; echo "\n"; echo "
"; if ($app_uuid == "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4" && permission_exists('inbound_route_add')) { @@ -244,7 +244,16 @@ else { } unset ($prep_statement); } - echo "
"; if ( ($app_uuid == "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4" && permission_exists('inbound_route_edit')) || @@ -261,8 +270,8 @@ else { echo " ".((strlen($row['dialplan_number']) > 0) ? $row['dialplan_number'] : " ")."".$row['dialplan_context']."".$row['dialplan_order']."".ucwords($row['dialplan_enabled'])."".$row['dialplan_order']."".ucwords($row['dialplan_enabled'])."".((strlen($row['dialplan_description']) > 0) ? $row['dialplan_description'] : " ")."\n"; if ( diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index 5697ea7b63..96f4b3be29 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -152,7 +152,7 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { - $tr_link = (permission_exists('extension_edit')) ? " onclick=\"document.location.href='extension_edit.php?id=".$row['extension_uuid']."';\"" : null; + $tr_link = (permission_exists('extension_edit')) ? " href='extension_edit.php?id=".$row['extension_uuid']."'" : null; echo "
"; if (permission_exists('extension_edit')) { diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index 5492b79c87..834dc59e30 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -164,7 +164,7 @@ else { if ($num_rows > 0) { foreach($result as $row) { - $tr_link = (permission_exists('gateway_edit')) ? " onclick=\"document.location.href='gateway_edit.php?id=".$row['gateway_uuid']."';\"" : null; + $tr_link = (permission_exists('gateway_edit')) ? "href='gateway_edit.php?id=".$row['gateway_uuid']."'" : null; echo "
"; if (permission_exists('gateway_edit')) { diff --git a/app/modules/modules.php b/app/modules/modules.php index 974f1b024f..b8b4ae1186 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -156,7 +156,7 @@ if (strlen($_GET["a"]) > 0) { echo $tmp_module_header; } - $tr_link = (permission_exists('module_edit')) ? " onclick=\"document.location.href='module_edit.php?id=".$row["module_uuid"]."';\"" : null; + $tr_link = (permission_exists('module_edit')) ? "href='module_edit.php?id=".$row["module_uuid"]."'" : null; echo "
"; if (permission_exists('module_edit')) { diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php index 9359867ae7..2d3816f752 100644 --- a/app/sip_profiles/sip_profile_settings.php +++ b/app/sip_profiles/sip_profile_settings.php @@ -106,7 +106,7 @@ require_once "resources/paging.php"; echo "
"; if (permission_exists('sip_profile_setting_edit')) { diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index 118c95c315..00c6c317a6 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -123,7 +123,7 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { - $tr_link = (permission_exists('sip_profile_edit')) ? " onclick=\"document.location.href='sip_profile_edit.php?id=".$row['sip_profile_uuid']."';\"" : null; + $tr_link = (permission_exists('sip_profile_edit')) ? "href='sip_profile_edit.php?id=".$row['sip_profile_uuid']."'" : null; echo "
"; if (permission_exists('sip_profile_edit')) { diff --git a/app/vars/vars.php b/app/vars/vars.php index c8847de66a..9bab595f2c 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -127,7 +127,7 @@ else { echo $tmp_var_header; } - $tr_link = (permission_exists('var_edit')) ? " onclick=\"document.location.href='var_edit.php?id=".$row['var_uuid']."';\"" : null; + $tr_link = (permission_exists('var_edit')) ? "href='var_edit.php?id=".$row['var_uuid']."'" : null; echo "
"; if (permission_exists('var_edit')) { diff --git a/app/xmpp/profile_list.php b/app/xmpp/profile_list.php index 01879f88ea..05844fdd8b 100644 --- a/app/xmpp/profile_list.php +++ b/app/xmpp/profile_list.php @@ -29,7 +29,7 @@ $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; foreach($profiles_array as $profile){ - $tr_link = (permission_exists('xmpp_edit')) ? " onclick=\"document.location.href='xmpp_profile_edit.php?id=".$profile['xmpp_profile_uuid']."';\"" : null; + $tr_link = (permission_exists('xmpp_edit')) ? "href='xmpp_profile_edit.php?id=".$profile['xmpp_profile_uuid']."'" : null; ?>
diff --git a/core/apps/apps.php b/core/apps/apps.php index 411958296b..3748c4022a 100644 --- a/core/apps/apps.php +++ b/core/apps/apps.php @@ -100,7 +100,7 @@ require_once "resources/paging.php"; foreach($apps as $row) { if ($row['uuid'] != "d8704214-75a0-e52f-1336-f0780e29fef8") { /* - $tr_link = (permission_exists('app_edit')) ? " onclick=\"document.location.href='apps_edit.php?id=".$row['uuid']."';\"" : null; + $tr_link = (permission_exists('app_edit')) ? "href='apps_edit.php?id=".$row['uuid']."'" : null; */ echo "
"; diff --git a/core/databases/databases.php b/core/databases/databases.php index 3025d05169..1bceccb612 100644 --- a/core/databases/databases.php +++ b/core/databases/databases.php @@ -124,7 +124,7 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { - $tr_link = " onclick=\"document.location.href='database_edit.php?id=".$row['database_uuid']."';\""; + $tr_link = "href='database_edit.php?id=".$row['database_uuid']."'"; echo "
".$row['database_driver']." ".$row['database_type']." 
"; if (permission_exists('default_setting_edit')) { diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 250943a34c..7453b6cee2 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -132,7 +132,7 @@ require_once "resources/paging.php"; echo "
"; if (permission_exists('domain_setting_edit')) { diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 0232f3ae7f..cf52165a55 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -177,7 +177,7 @@ else { if ($result_count > 0) { foreach($result as $row) { - $tr_link = (permission_exists('domain_edit')) ? " onclick=\"document.location.href='domain_edit.php?id=".$row['domain_uuid']."';\"" : null; + $tr_link = (permission_exists('domain_edit')) ? "href='domain_edit.php?id=".$row['domain_uuid']."'" : null; echo "
"; if (permission_exists('domain_edit')) { diff --git a/core/menu/menu.php b/core/menu/menu.php index 0e4352e79e..1917174cf1 100644 --- a/core/menu/menu.php +++ b/core/menu/menu.php @@ -117,7 +117,7 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { - $tr_link = " onclick=\"document.location.href='menu_edit.php?id=".$row['menu_uuid']."';\""; + $tr_link = "href='menu_edit.php?id=".$row['menu_uuid']."'"; echo "
".$row['menu_name']."".$row['menu_language']."
"; echo " "; @@ -269,7 +269,7 @@ $order = $_GET["order"]; } //display the content of the list - $tr_link = (permission_exists('menu_edit')) ? " onclick=\"document.location.href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."';\"" : null; + $tr_link = (permission_exists('menu_edit')) ? "href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."'" : null; echo "\n"; echo ""; echo ""; diff --git a/core/users/groups.php b/core/users/groups.php index 08ee82271f..839b48d1b6 100644 --- a/core/users/groups.php +++ b/core/users/groups.php @@ -114,7 +114,7 @@ else { } else { /* - $tr_link = (permission_exists('group_edit')) ? " onclick=\"document.location.href='groupedit.php?id=".$group_uuid."';\"" : null; + $tr_link = (permission_exists('group_edit')) ? "href='groupedit.php?id=".$group_uuid."'" : null; */ $strlist .= "\n"; $strlist .= "\n"; echo "
".$menu_item_title." ".$group_list." 
"; diff --git a/core/users/users.php b/core/users/users.php index f72982984e..9e7477a0a0 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -149,7 +149,7 @@ echo " \n"; if (if_superadmin($superadmins, $row['user_uuid']) && !if_group("superadmin")) { //hide } else { - $tr_link = (permission_exists('user_edit')) ? " onclick=\"document.location.href='usersupdate.php?id=".$row['user_uuid']."';\"" : null; + $tr_link = (permission_exists('user_edit')) ? "href='usersupdate.php?id=".$row['user_uuid']."'" : null; echo "
"; if (permission_exists('user_edit')) { diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index 803a324663..73b7eba709 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -774,7 +774,6 @@ legend { -