\n";
diff --git a/core/domains/domains.php b/core/domains/domains.php
index 73dfc52573..036c4d2854 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -26,7 +26,7 @@
require_once "root.php";
require_once "includes/require.php";
require_once "includes/checkauth.php";
-if (if_group("admin") || if_group("superadmin")) {
+if (permission_exists('domain_view')) {
//access granted
}
else {
@@ -34,46 +34,48 @@ else {
exit;
}
-//change the tenant
- if (strlen($_GET["domain_uuid"]) > 0 && $_GET["domain_change"] == "true") {
- //get the domain_uuid
- $sql = "select * from v_domains ";
- $sql .= "order by domain_name asc ";
- $prep_statement = $db->prepare($sql);
- $prep_statement->execute();
- $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
- foreach($result as $row) {
- if (count($result) == 0) {
- $_SESSION["domain_uuid"] = $row["domain_uuid"];
- $_SESSION["domain_name"] = $row['domain_name'];
- }
- else {
- if ($row['domain_name'] == $domain_array[0] || $row['domain_name'] == 'www.'.$domain_array[0]) {
+//change the domain
+ if (strlen(check_str($_GET["domain_uuid"])) > 0 && check_str($_GET["domain_change"]) == "true") {
+ if (permission_exists('domain_select')) {
+ //get the domain_uuid
+ $sql = "select * from v_domains ";
+ $sql .= "order by domain_name asc ";
+ $prep_statement = $db->prepare($sql);
+ $prep_statement->execute();
+ $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+ foreach($result as $row) {
+ if (count($result) == 0) {
$_SESSION["domain_uuid"] = $row["domain_uuid"];
$_SESSION["domain_name"] = $row['domain_name'];
}
- $_SESSION['domains'][$row['domain_uuid']]['domain_uuid'] = $row['domain_uuid'];
- $_SESSION['domains'][$row['domain_uuid']]['domain_name'] = $row['domain_name'];
+ else {
+ if ($row['domain_name'] == $domain_array[0] || $row['domain_name'] == 'www.'.$domain_array[0]) {
+ $_SESSION["domain_uuid"] = $row["domain_uuid"];
+ $_SESSION["domain_name"] = $row['domain_name'];
+ }
+ $_SESSION['domains'][$row['domain_uuid']]['domain_uuid'] = $row['domain_uuid'];
+ $_SESSION['domains'][$row['domain_uuid']]['domain_name'] = $row['domain_name'];
+ }
}
- }
- unset($result, $prep_statement);
+ unset($result, $prep_statement);
- //update the domain session variables
- $domain_uuid = check_str($_GET["domain_uuid"]);
- $_SESSION['domain_uuid'] = $domain_uuid;
- $_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
- $_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'];
- //clear the menu session so that it is regenerated for the selected domain
- $_SESSION["menu"] = '';
- //clear the extension array so that it is regenerated for the selected domain
- unset($_SESSION['extension_array']);
- //set the context
- if (count($_SESSION["domains"]) > 1) {
- $_SESSION["context"] = $_SESSION["domain_name"];
- }
- else {
- $_SESSION["context"] = 'default';
- }
+ //update the domain session variables
+ $domain_uuid = check_str($_GET["domain_uuid"]);
+ $_SESSION['domain_uuid'] = $domain_uuid;
+ $_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
+ $_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'];
+ //clear the menu session so that it is regenerated for the selected domain
+ $_SESSION["menu"] = '';
+ //clear the extension array so that it is regenerated for the selected domain
+ unset($_SESSION['extension_array']);
+ //set the context
+ if (count($_SESSION["domains"]) > 1) {
+ $_SESSION["context"] = $_SESSION["domain_name"];
+ }
+ else {
+ $_SESSION["context"] = 'default';
+ }
+ }
}
//includes
@@ -151,7 +153,12 @@ else {
echo th_order_by('domain_name', 'Domain', $order_by, $order);
echo th_order_by('domain_description', 'Description', $order_by, $order);
echo "
\n";
- echo " $v_link_label_add\n";
+ if (permission_exists('domain_add')) {
+ echo " $v_link_label_add\n";
+ }
+ else {
+ echo " \n";
+ }
echo " | \n";
echo "
\n";
@@ -161,8 +168,12 @@ else {
echo " | ".$row['domain_name']." | \n";
echo " ".$row['domain_description']." | \n";
echo " \n";
- echo " $v_link_label_edit\n";
- echo " $v_link_label_delete\n";
+ if (permission_exists('domain_edit')) {
+ echo " $v_link_label_edit\n";
+ }
+ if (permission_exists('domain_delete')) {
+ echo " $v_link_label_delete\n";
+ }
echo " | \n";
echo "
\n";
if ($c==0) { $c=1; } else { $c=0; }
@@ -170,7 +181,6 @@ else {
unset($sql, $result, $row_count);
} //end if results
-
echo "
\n";
echo "\n";
echo " \n";
@@ -178,7 +188,12 @@ else {
echo " | | \n";
echo " $paging_controls | \n";
echo " \n";
- echo " $v_link_label_add\n";
+ if (permission_exists('domain_add')) {
+ echo " $v_link_label_add\n";
+ }
+ else {
+ echo " \n";
+ }
echo " | \n";
echo " \n";
echo " \n";
diff --git a/core/domains/domains_delete.php b/core/domains/domains_delete.php
index 16cecb8a35..a09e498776 100644
--- a/core/domains/domains_delete.php
+++ b/core/domains/domains_delete.php
@@ -26,7 +26,7 @@
require_once "root.php";
require_once "includes/require.php";
require_once "includes/checkauth.php";
-if (if_group("admin") || if_group("superadmin")) {
+if (permission_exists('domain_delete')) {
//access granted
}
else {
diff --git a/core/domains/domains_edit.php b/core/domains/domains_edit.php
index c878f0e398..6dded99416 100644
--- a/core/domains/domains_edit.php
+++ b/core/domains/domains_edit.php
@@ -26,7 +26,7 @@
require_once "root.php";
require_once "includes/require.php";
require_once "includes/checkauth.php";
-if (if_group("admin") || if_group("superadmin")) {
+if (permission_exists('domain_add') || permission_exists('domain_edit')) {
//access granted
}
else {
@@ -74,7 +74,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
//add or update the database
if ($_POST["persistformvar"] != "true") {
- if ($action == "add") {
+ if ($action == "add" && permission_exists('domain_add')) {
$sql = "select count(*) as num_rows from v_domains ";
$sql .= "where domain_name = '$domain_name' ";
$prep_statement = $db->prepare($sql);
@@ -100,7 +100,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
}
- if ($action == "update") {
+ if ($action == "update" && permission_exists('domain_edit')) {
$sql = "update v_domains set ";
$sql .= "domain_name = '$domain_name', ";
$sql .= "domain_description = '$domain_description' ";
@@ -158,7 +158,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "\n";
echo "\n";
echo " \n";
- echo "
";
+ echo "
";
echo " |
1) {
+ if (permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
//$tmp_style = "style=\"opacity:0.7;filter:alpha(opacity=70)\" ";
//$tmp_style .= "onmouseover=\"this.style.opacity=1;this.filters.alpha.opacity=90\" ";
//$tmp_style .= "onmouseout=\"this.style.opacity=0.7;this.filters.alpha.opacity=70\" ";
diff --git a/themes/classic/template.php b/themes/classic/template.php
index 02f7cd235c..1013e696d0 100644
--- a/themes/classic/template.php
+++ b/themes/classic/template.php
@@ -518,7 +518,7 @@ function confirmdelete(url) {
|
1) {
+ if (permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
//$tmp_style = "style=\"opacity:0.7;filter:alpha(opacity=70)\" ";
//$tmp_style .= "onmouseover=\"this.style.opacity=1;this.filters.alpha.opacity=90\" ";
//$tmp_style .= "onmouseout=\"this.style.opacity=0.7;this.filters.alpha.opacity=70\" ";
diff --git a/themes/default/template.php b/themes/default/template.php
index 44b9965696..1dffa13d15 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -654,7 +654,7 @@ function confirmdelete(url) {
|
1) {
+ if (permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
//$tmp_style = "style=\"opacity:0.7;filter:alpha(opacity=70)\" ";
//$tmp_style .= "onmouseover=\"this.style.opacity=1;this.filters.alpha.opacity=90\" ";
//$tmp_style .= "onmouseout=\"this.style.opacity=0.7;this.filters.alpha.opacity=70\" ";
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 7c4e8fc10d..c9b9f44af9 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -655,7 +655,7 @@ function confirmdelete(url) {
|
1) {
+ if (permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
//$tmp_style = "style=\"opacity:0.7;filter:alpha(opacity=70)\" ";
//$tmp_style .= "onmouseover=\"this.style.opacity=1;this.filters.alpha.opacity=90\" ";
//$tmp_style .= "onmouseout=\"this.style.opacity=0.7;this.filters.alpha.opacity=70\" ";
| |