diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php index 5e6c249621..8dd8b5d5b3 100644 --- a/app/sip_profiles/sip_profile_edit.php +++ b/app/sip_profiles/sip_profile_edit.php @@ -183,7 +183,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo " ".$text['label-name'].":\n"; echo "\n"; echo "\n"; @@ -209,7 +209,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['label-description'].":\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
\n"; echo $text['description-description']."\n"; echo "\n"; diff --git a/app/sip_profiles/sip_profile_setting_edit.php b/app/sip_profiles/sip_profile_setting_edit.php index 758540b91b..327381ab93 100644 --- a/app/sip_profiles/sip_profile_setting_edit.php +++ b/app/sip_profiles/sip_profile_setting_edit.php @@ -195,7 +195,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo " ".$text['label-setting_name'].":\n"; echo "\n"; echo "\n"; @@ -206,7 +206,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo " ".$text['label-setting_value'].":\n"; echo "\n"; echo "\n"; diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php index 7cb8735844..9359867ae7 100644 --- a/app/sip_profiles/sip_profile_settings.php +++ b/app/sip_profiles/sip_profile_settings.php @@ -93,30 +93,37 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('sip_profile_setting_name', $text['label-setting_name'], $order_by, $order); echo th_order_by('sip_profile_setting_value', $text['label-setting_value'], $order_by, $order); echo th_order_by('sip_profile_setting_enabled', $text['label-setting_enabled'], $order_by, $order); echo th_order_by('sip_profile_setting_description', $text['label-setting_description'], $order_by, $order); echo "\n"; - echo "\n"; if ($num_rows > 0) { foreach($result as $row) { - echo "\n"; - echo " \n"; + $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; + echo "\n"; + echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; @@ -133,7 +140,7 @@ require_once "resources/paging.php"; echo " \n"; echo " \n"; echo " \n"; diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index 1dff138d9d..118c95c315 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -110,7 +110,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "
"; - if (permission_exists('sip_profile_add')) { + if (permission_exists('sip_profile_setting_add')) { echo "$v_link_label_add"; } echo "
".$row['sip_profile_setting_name']." 
"; + if (permission_exists('sip_profile_setting_edit')) { + echo "".$row['sip_profile_setting_name'].""; + } + else { + echo $row['sip_profile_setting_name']; + } + echo " ".$row['sip_profile_setting_value']." ".(($row['sip_profile_setting_enabled'] == 'true') ? $text['option-true'] : $text['option-false'])." ".$row['sip_profile_setting_description']." ".$row['sip_profile_setting_description']." "; - if (permission_exists('sip_profile_edit')) { + if (permission_exists('sip_profile_setting_edit')) { echo "$v_link_label_edit"; } - if (permission_exists('sip_profile_delete')) { + if (permission_exists('sip_profile_setting_delete')) { echo "$v_link_label_delete"; } echo "  $paging_controls"; - if (permission_exists('sip_profile_add')) { + if (permission_exists('sip_profile_setting_add')) { echo "$v_link_label_add"; } echo "
\n"; + echo "
\n"; echo "\n"; echo th_order_by('sip_profile_name', $text['label-name'], $order_by, $order); echo "\n"; @@ -120,12 +120,19 @@ require_once "resources/paging.php"; echo "$v_link_label_add"; } echo "\n"; - echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; - echo " \n"; + $tr_link = (permission_exists('sip_profile_edit')) ? " onclick=\"document.location.href='sip_profile_edit.php?id=".$row['sip_profile_uuid']."';\"" : null; + echo "\n"; + echo " \n"; echo " \n"; echo " \n"; echo "
".$text['label-hostname']."
".$row['sip_profile_name']." 
"; + if (permission_exists('sip_profile_edit')) { + echo "".$row['sip_profile_name'].""; + } + else { + echo $row['sip_profile_name']; + } + echo " ".$row['sip_profile_hostname']." ".$row['sip_profile_description']." "; diff --git a/core/apps/apps.php b/core/apps/apps.php index 55f601d6e3..411958296b 100644 --- a/core/apps/apps.php +++ b/core/apps/apps.php @@ -81,30 +81,52 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; - //echo "\n"; + /* + echo "\n"; + */ echo "\n"; foreach($apps as $row) { if ($row['uuid'] != "d8704214-75a0-e52f-1336-f0780e29fef8") { - echo "\n"; - echo " \n"; + /* + $tr_link = (permission_exists('app_edit')) ? " onclick=\"document.location.href='apps_edit.php?id=".$row['uuid']."';\"" : null; + */ + echo "\n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; /* // temporarily disabled - echo " \n"; */ echo "\n"; @@ -113,6 +135,16 @@ require_once "resources/paging.php"; } //end foreach unset($sql, $result, $row_count); + echo "\n"; + echo " \n"; + /* + echo "\n"; + */ + echo ""; echo "
".$text['label-name']."".$text['label-category']."".$text['label-subcategory']."".$text['label-version']."".$text['label-description']."\n"; - //echo " $v_link_label_add\n"; - //echo "\n"; + if (permission_exists('app_add')) { + echo " $v_link_label_add\n"; + } + echo "
".$row['name']." 
"; + /* + if (permission_exists('app_edit')) { + echo " ".$row['name'].""; + } + else { + */ + echo $row['name']; + /* + } + */ + echo " ".$row['category']." ".$row['subcategory']." ".$row['version']." ".$row['description']['en-us']." \n"; - echo "  $v_link_label_edit\n"; - echo " $v_link_label_delete\n"; + echo " "; + if (permission_exists('app_edit')) { + echo " $v_link_label_edit\n"; + } + if (permission_exists('app_delete')) { + echo " $v_link_label_delete\n"; + } echo "
 \n"; + if (permission_exists('app_add')) { + echo " $v_link_label_add\n"; + } + echo "
"; echo "
"; echo "

"; diff --git a/core/databases/databases.php b/core/databases/databases.php index 758fea5da6..3025d05169 100644 --- a/core/databases/databases.php +++ b/core/databases/databases.php @@ -106,7 +106,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('database_driver', $text['label-driver'], $order_by, $order); @@ -124,12 +124,13 @@ require_once "resources/paging.php"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = " onclick=\"document.location.href='database_edit.php?id=".$row['database_uuid']."';\""; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; //echo " \n"; - echo " \n"; + echo " \n"; //echo " \n"; //echo " \n"; echo " \n"; diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 9e50dbd084..9ac00e799f 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -213,7 +213,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; echo "
".$row['database_driver']." ".$row['database_type']." ".$row['database_host']." ".$row['database_port']." ".$row['database_name']." ".$row['database_name']." ".$row['database_username']." ".$row['database_path']." ".$row['database_description']." 
\n"; + echo "\n"; echo " ".$text['label-subcategory'].":\n"; echo "\n"; diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index 4833acb6b7..bd15d36cf7 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -111,7 +111,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; if ($result_count > 0) { $previous_category = ''; @@ -148,9 +148,16 @@ require_once "resources/paging.php"; echo "\n"; echo "\n"; } - echo "\n"; - 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; + echo "\n"; + echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
".$row['default_setting_subcategory']." ".$row['default_setting_name']." 
"; + if (permission_exists('default_setting_edit')) { + echo "".$row['default_setting_subcategory'].""; + } + else { + echo $row['default_setting_subcategory']; + } + echo " ".$row['default_setting_name']."\n"; $category = $row['default_setting_category']; @@ -176,7 +183,7 @@ require_once "resources/paging.php"; } echo "  \n"; echo " ".$row['default_setting_enabled']." ".ucwords($row['default_setting_enabled'])." ".$row['default_setting_description']." "; if (permission_exists('default_setting_edit')) { diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index b39723dc27..250943a34c 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -106,16 +106,19 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; if ($result_count > 0) { $previous_category = ''; foreach($result as $row) { if ($previous_category != $row['domain_setting_category']) { - echo "\n"; + echo ""; + echo " \n"; + echo "\n"; echo "\n"; echo th_order_by('domain_setting_subcategory', $text['label-category'], $order_by, $order); echo th_order_by('domain_setting_name', $text['label-type'], $order_by, $order); @@ -129,8 +132,16 @@ require_once "resources/paging.php"; echo "\n"; 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; + echo "\n"; + echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo "\n"; diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 083eb8cc5c..0232f3ae7f 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -164,7 +164,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; - echo " ".ucfirst($row['domain_setting_category'])." 
\n"; + echo "
\n"; + echo "
\n"; + echo " ".ucfirst($row['domain_setting_category'])." \n"; + echo "
".$row['domain_setting_subcategory']." 
"; + if (permission_exists('domain_setting_edit')) { + echo "".$row['domain_setting_subcategory'].""; + } + else { + echo $row['domain_setting_subcategory']; + } + echo " ".$row['domain_setting_name']." \n"; @@ -158,14 +169,14 @@ require_once "resources/paging.php"; } echo "  \n"; echo " ".$row['domain_setting_enabled']." ".ucwords($row['domain_setting_enabled'])." ".$row['domain_setting_description']." "; if (permission_exists('domain_setting_edit')) { - echo "$v_link_label_edit"; + echo "$v_link_label_edit"; } if (permission_exists('domain_setting_delete')) { - echo "$v_link_label_delete"; + echo "$v_link_label_delete"; } echo "
\n"; + echo "
\n"; echo "\n"; echo th_order_by('domain_name', $text['label-domain'], $order_by, $order); echo th_order_by('domain_description', $text['label-description'], $order_by, $order); @@ -177,8 +177,16 @@ else { if ($result_count > 0) { foreach($result as $row) { - echo "\n"; - echo " \n"; + $tr_link = (permission_exists('domain_edit')) ? " onclick=\"document.location.href='domain_edit.php?id=".$row['domain_uuid']."';\"" : null; + echo "\n"; + echo " \n"; echo " \n"; echo "
".$row['domain_name']." 
"; + if (permission_exists('domain_edit')) { + echo "".$row['domain_name'].""; + } + else { + echo $row['domain_name']; + } + echo " ".$row['domain_description']." "; if (permission_exists('domain_edit')) { diff --git a/core/users/groups.php b/core/users/groups.php index 2c87923c06..08ee82271f 100644 --- a/core/users/groups.php +++ b/core/users/groups.php @@ -85,7 +85,7 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - $strlist = "\n"; + $strlist = "
\n"; $strlist .= "\n"; $strlist .= " \n"; $strlist .= " \n"; @@ -113,8 +113,22 @@ else { //hide the superadmin group from non superadmin's } else { - $strlist .= ""; - $strlist .= "\n"; + /* + $tr_link = (permission_exists('group_edit')) ? " onclick=\"document.location.href='groupedit.php?id=".$group_uuid."';\"" : null; + */ + $strlist .= "\n"; + $strlist .= "\n"; $strlist .= "\n"; $strlist .= "\n"; $strlist .= "\n"; $strlist .= "\n"; }
".$text['label-group_name']."".$text['label-group_description']."
".$group_name."
"; + /* + if (permission_exists('group_edit')) { + $strlist .= "".$group_name.""; + } + else { + */ + $strlist .= $group_name; + /* + } + */ + $strlist .= "".$group_description."\n"; if (permission_exists('group_add') || if_group("superadmin")) { @@ -133,7 +147,14 @@ else { } $strlist .= ""; - $strlist .= "$v_link_label_delete"; + /* + if (permission_exists('group_edit')) { + $strlist .= "$v_link_label_edit"; + } + */ + if (permission_exists('group_delete')) { + $strlist .= "$v_link_label_delete"; + } $strlist .= "