diff --git a/app/calls/calls.php b/app/calls/calls.php index 7c6a36e9af..44c895082e 100644 --- a/app/calls/calls.php +++ b/app/calls/calls.php @@ -140,7 +140,7 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -149,20 +149,14 @@ else { if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $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; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo "\n"; diff --git a/app/content/rsslist.php b/app/content/rsslist.php index c8c9b6163c..8597dd4d88 100644 --- a/app/content/rsslist.php +++ b/app/content/rsslist.php @@ -90,7 +90,7 @@ $order = $_GET["order"]; $row_style["1"] = "row_style1"; echo "
\n"; - echo "
".$text['table-extension']."".$text['table-tools']."
".$row['extension']."\n"; - if (permission_exists('call_forward')) { - echo " ".$text['label-call-forward']." \n"; - echo "   \n"; - } - if (permission_exists('follow_me')) { - echo " ".$text['label-follow-me']." \n"; - echo "   \n"; - } - if (permission_exists('do_not_disturb')) { - echo " ".$text['label-dnd']." \n"; - } + if (permission_exists('call_forward')) { echo "".$text['label-call-forward']."   "; } + if (permission_exists('follow_me')) { echo "".$text['label-follow-me']."   "; } + if (permission_exists('do_not_disturb')) { echo "".$text['label-dnd'].""; } echo " ".$row['description']." 
\n"; + echo "
\n"; echo ""; echo th_order_by('rss_title', $text['label-title'], $order_by, $order); echo th_order_by('rss_link', $text['label-link'], $order_by, $order); @@ -110,7 +110,8 @@ $order = $_GET["order"]; if ($result_count > 0) { foreach($result as $row) { //print_r( $row ); - echo "\n"; + $tr_link = " onclick=\"document.location.href='rssupdate.php?rss_uuid=".$row[rss_uuid]."';\""; + echo "\n"; //echo ""; //echo ""; diff --git a/app/content/rssupdate.php b/app/content/rssupdate.php index bca87c2376..0b9321d990 100644 --- a/app/content/rssupdate.php +++ b/app/content/rssupdate.php @@ -163,7 +163,7 @@ else { } echo "
"; - echo "
".$row[rss_uuid]."".$row[rss_category]."
\n"; + echo "
\n"; echo "\n"; echo "
\n"; diff --git a/app/devices/devices.php b/app/devices/devices.php index 56ede3e22e..73c84de8d9 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -135,7 +135,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; //echo th_order_by('device_uuid', $text['label-device_uuid'], $order_by, $order); echo th_order_by('device_mac_address', $text['label-device_mac_address'], $order_by, $order); @@ -164,7 +164,8 @@ 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); - echo "\n"; + $tr_link = (permission_exists('device_edit')) ? " onclick=\"document.location.href='device_edit.php?id=".$row['device_uuid']."';\"" : null; + echo "\n"; //echo " \n"; echo "
".$row['device_uuid']." "; if (permission_exists('device_edit')) { diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index 20bbccd720..5697ea7b63 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -136,7 +136,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('extension', $text['label-extension'], $order_by, $order); echo th_order_by('call_group', $text['label-call_group'], $order_by, $order); @@ -152,7 +152,7 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { - $tr_link = (permission_exists('extension_edit')) ? "style='cursor: pointer;' onclick=\"document.location.href='extension_edit.php?id=".$row['extension_uuid']."';\"" : null; + $tr_link = (permission_exists('extension_edit')) ? " onclick=\"document.location.href='extension_edit.php?id=".$row['extension_uuid']."';\"" : null; echo "\n"; echo " \n"; echo " \n"; //echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
"; if (permission_exists('extension_edit')) { @@ -164,7 +164,7 @@ require_once "resources/paging.php"; echo "".$row['call_group']." ".$row['voicemail_mail_to']." ".$row['enabled']."".ucwords($row['enabled'])."".$row['description']." "; if (permission_exists('extension_edit')) { diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index 381804923f..5492b79c87 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -144,7 +144,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('gateway', $text['label-gateway'], $order_by, $order); echo th_order_by('context', $text['label-context'], $order_by, $order); @@ -164,7 +164,8 @@ else { if ($num_rows > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('gateway_edit')) ? " onclick=\"document.location.href='gateway_edit.php?id=".$row['gateway_uuid']."';\"" : null; + echo "\n"; echo " \n"; echo "\n"; echo "
"; if (permission_exists('gateway_edit')) { echo "".$row["gateway"].""; diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php index 7826d0859f..c8dae7bb7b 100644 --- a/app/modules/module_edit.php +++ b/app/modules/module_edit.php @@ -246,19 +246,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo " \n"; echo "
\n"; echo "\n"; @@ -271,19 +270,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "		\n"; echo " \n"; echo "
\n"; echo "\n"; diff --git a/app/modules/modules.php b/app/modules/modules.php index cabb66f9cb..974f1b024f 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -114,7 +114,7 @@ if (strlen($_GET["a"]) > 0) { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; $tmp_module_header = "\n"; $tmp_module_header .= "\n"; $tmp_module_header .= "\n"; @@ -156,7 +156,8 @@ if (strlen($_GET["a"]) > 0) { echo $tmp_module_header; } - echo "\n"; + $tr_link = (permission_exists('module_edit')) ? " onclick=\"document.location.href='module_edit.php?id=".$row["module_uuid"]."';\"" : null; + echo "\n"; echo "
".$text['label-label']."
"; if (permission_exists('module_edit')) { echo "".$row["module_label"].""; diff --git a/app/vars/vars.php b/app/vars/vars.php index 12bc03f313..c8847de66a 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -81,7 +81,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; $tmp_var_header = ''; $tmp_var_header .= "\n"; @@ -127,7 +127,8 @@ else { echo $tmp_var_header; } - echo "\n"; + $tr_link = (permission_exists('var_edit')) ? " onclick=\"document.location.href='var_edit.php?id=".$row['var_uuid']."';\"" : null; + echo "\n"; echo "
"; if (permission_exists('var_edit')) { echo "".substr($row['var_name'],0,32).""; diff --git a/app/xmpp/profile_list.php b/app/xmpp/profile_list.php index b8ad96ad0e..01879f88ea 100644 --- a/app/xmpp/profile_list.php +++ b/app/xmpp/profile_list.php @@ -9,7 +9,7 @@

- +
@@ -29,12 +29,22 @@ $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; + ?> + > + - + \n"; echo "\n"; echo ""; - //echo ""; - echo ""; - echo ""; + //echo ""; + echo ""; + echo ""; //echo ""; - //echo ""; + //echo ""; if ($menu_item_protected == "true") { - echo ""; + echo ""; } else { - echo ""; + echo ""; } echo "
 
+ '> +         \n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('menu_name', $text['label-name'], $order_by, $order); echo th_order_by('menu_language', $text['label-language'], $order_by, $order); @@ -117,7 +117,8 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = " onclick=\"document.location.href='menu_edit.php?id=".$row['menu_uuid']."';\""; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php index 4bc8934edf..22634e1771 100644 --- a/core/menu/menu_edit.php +++ b/core/menu/menu_edit.php @@ -204,7 +204,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; echo "\n"; echo "\n"; - echo "\n"; echo "\n"; echo "\n"; + $assigned_groups[] = $field['group_name']; } } echo "
".$row['menu_name']."".$row['menu_language']."".$row['menu_description']."
\n"; + echo "\n"; echo " ".$text['label-name'].":\n"; echo "\n"; @@ -215,7 +215,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; + echo "\n"; echo " ".$text['label-language'].":\n"; echo "\n"; diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index 6f73e07f21..0fcdc32f32 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -399,6 +399,7 @@ else { } echo "
\n"; @@ -412,15 +413,14 @@ else { echo "\n"; $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); foreach($result as $field) { - if ($field['group_name'] == "superadmin") { - //only show the superadmin group to other users in the superadmin group - if (if_group("superadmin")) { + if (!in_array($field['group_name'], $assigned_groups)) { + if ($field['group_name'] == "superadmin" && if_group("superadmin")) { + echo "\n"; //only show the superadmin group to other users in the superadmin group + } + else { echo "\n"; } } - else { - echo "\n"; - } } echo ""; echo "\n"; @@ -434,19 +434,18 @@ else { echo "		\n"; echo "
\n"; echo $text['description-protected']."
\n"; echo "\n"; diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php index 333557c945..a7c7767fec 100644 --- a/core/menu/menu_item_list.php +++ b/core/menu/menu_item_list.php @@ -101,7 +101,8 @@ function build_db_child_menu_list ($db, $menu_item_level, $menu_item_uuid, $c) { } //display the content of the list - echo "\n"; + $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; + echo "
"; echo " "; echo " "; @@ -117,16 +118,16 @@ function build_db_child_menu_list ($db, $menu_item_level, $menu_item_uuid, $c) { echo " "; echo "
"; echo "		 ".$menu_item_link."  ".$group_list."  ".$menu_item_category." ".$menu_item_link." ".$group_list." ".$menu_item_category." ".$row[menu_item_description]." ".$row[menu_item_order]." ".$row[menu_item_order]."   ".$text['label-true']."  ".$text['label-true']."    ".$text['label-false']."  ".$text['label-false']."  "; echo "  "; @@ -203,7 +204,7 @@ $order = $_GET["order"]; $row_style["1"] = "row_style0"; echo "
\n"; - echo "\n"; + echo "
\n"; if ($result_count == 0) { //no results @@ -211,11 +212,11 @@ $order = $_GET["order"]; } else { echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; echo "\n"; - echo ""; - echo ""; - //echo ""; - echo ""; + $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; + echo "\n"; + echo ""; + echo ""; + //echo ""; + echo ""; //echo ""; - //echo ""; - //echo ""; + //echo ""; + //echo ""; if ($menu_item_protected == "true") { - echo ""; + echo ""; } else { - echo ""; + echo ""; } - echo ""; diff --git a/core/users/users.php b/core/users/users.php index cad464d42a..f72982984e 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -132,7 +132,7 @@ echo "
  ".$text['label-title']."     ".$text['label-groups']."     ".$text['label-category']."     ".$text['label-protected']."     ".$text['label-menu_order']."   ".$text['label-title']."".$text['label-groups']."".$text['label-category']."".$text['label-protected']."".$text['label-menu_order'].""; if (permission_exists('menu_add')) { echo "$v_link_label_add"; @@ -232,8 +233,7 @@ $order = $_GET["order"]; $menu_item_protected = $row['menu_item_protected']; //get the groups that have been assigned to the menu - $sql = ""; - $sql .= "select group_name from v_menu_item_groups "; + $sql = "select group_name from v_menu_item_groups "; $sql .= "where menu_uuid = '$menu_uuid' "; $sql .= "and menu_item_uuid = '$menu_item_uuid' "; $sub_prep_statement = $db->prepare(check_sql($sql)); @@ -269,23 +269,24 @@ $order = $_GET["order"]; } //display the content of the list - echo "
  ".$menu_item_title."   ".$group_list."  ".$menu_item_link."  ".$menu_item_category." 
".$menu_item_title." ".$group_list." ".$menu_item_link." ".$menu_item_category." ".$row[menu_item_description]." ".$row['menu_item_parent_uuid']."  ".$row['menu_item_order']." ".$row['menu_item_parent_uuid']." ".$row['menu_item_order']."   ".$text['label-true']."  ".$text['label-true']."    ".$text['label-false']."  ".$text['label-false']."  "; + echo ""; echo " ".$row[menu_item_order]." "; echo "\n"; //show the data echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('username', $text['label-username'], $order_by, $order); @@ -149,7 +149,8 @@ echo " \n"; + $tr_link = (permission_exists('user_edit')) ? " onclick=\"document.location.href='usersupdate.php?id=".$row['user_uuid']."';\"" : null; + echo "\n"; echo "
\n"; if (if_superadmin($superadmins, $row['user_uuid']) && !if_group("superadmin")) { //hide } else { - echo "
"; if (permission_exists('user_edit')) { echo "".$row['username'].""; diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php index be7b83080f..803a324663 100644 --- a/themes/enhanced/template.php +++ b/themes/enhanced/template.php @@ -278,6 +278,16 @@ input[type=text]::-ms-clear { padding: 4px 16px 4px 6px; } +table.tr_hover tr { + background-color: transparent; + cursor: default; + } + +table.tr_hover tr:hover td, +table.tr_hover tr:hover td a { + color: #5082ca; + } + .row_style0 { border-bottom: 1px solid #c5d1e5; background-color: #e5e9f0; @@ -286,7 +296,6 @@ input[type=text]::-ms-clear { padding: 5px 7px; } - .row_style1 { border-bottom: 1px solid #c5d1e5; background-color: #fff;