Browse Source

Audited the permissions names. Permissions names are to be non plural.

Mark Crane 12 years ago
parent
commit
07a26d1308

+ 3 - 3
core/domain_settings/domain_settings.php

@@ -119,7 +119,7 @@ require_once "resources/paging.php";
 				echo th_order_by('domain_setting_description', $text['label-description'], $order_by, $order);
 				echo "<td align='right' width='42'>\n";
 				if (permission_exists('domain_setting_add')) {
-					echo "	<a href='domain_settings_edit.php?domain_uuid=".$_GET['id']."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+					echo "	<a href='domain_setting_edit.php?domain_uuid=".$_GET['id']."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
 				}
 				else {
 					echo "	&nbsp;\n";
@@ -161,7 +161,7 @@ require_once "resources/paging.php";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['domain_setting_description']."&nbsp;</td>\n";
 			echo "	<td valign='top' align='right'>\n";
 			if (permission_exists('domain_setting_edit')) {
-			echo "		<a href='domain_settings_edit.php?domain_uuid=".$row['domain_uuid']."&id=".$row['domain_setting_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+			echo "		<a href='domain_setting_edit.php?domain_uuid=".$row['domain_uuid']."&id=".$row['domain_setting_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
 			}
 			if (permission_exists('domain_setting_delete')) {
 			echo "		<a href='domain_settings_delete.php?domain_uuid=".$row['domain_uuid']."&id=".$row['domain_setting_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
@@ -182,7 +182,7 @@ require_once "resources/paging.php";
 	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
 	echo "		<td width='33.3%' align='right'>\n";
 	if (permission_exists('domain_setting_add')) {
-		echo "			<a href='domain_settings_edit.php?domain_uuid=".$_GET['id']."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+		echo "			<a href='domain_setting_edit.php?domain_uuid=".$_GET['id']."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
 	}
 	else {
 		echo "			&nbsp;\n";

+ 2 - 2
core/user_settings/app_config.php

@@ -38,12 +38,12 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'user_account_settings_view';
+		$apps[$x]['permissions'][0]['name'] = 'user_account_setting_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'user';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'user_account_settings_edit';
+		$apps[$x]['permissions'][1]['name'] = 'user_account_setting_edit';
 		$apps[$x]['permissions'][1]['groups'][] = 'user';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';

+ 2 - 2
core/user_settings/user_edit.php

@@ -28,7 +28,7 @@ require_once "resources/require.php";
 require_once "resources/check_auth.php";
 include "app_languages.php";
 
-if (permission_exists("user_account_settings_view")) {
+if (permission_exists("user_account_setting_view")) {
 	//access granted
 }
 else {
@@ -179,7 +179,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		$sql .= "user_status = '$user_status' ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and user_uuid = '$user_uuid' ";
-		if (permission_exists("user_account_settings_edit")) {
+		if (permission_exists("user_account_setting_edit")) {
 			$count = $db->exec(check_sql($sql));
 		}
 

+ 1 - 1
core/users/usersupdate.php

@@ -480,7 +480,7 @@ else {
 	echo "<br />\n";
 	echo $text['description-contact']."\n";
 	if (strlen($contact_uuid) > 0) {
-		echo "			<a href=\"/app/contacts/contacts_edit.php?id=$contact_uuid\">".$text['description-contact_view']."</a>\n";
+		echo "			<a href=\"/app/contacts/contact_edit.php?id=$contact_uuid\">".$text['description-contact_view']."</a>\n";
 	}
 	echo "		</td>";
 	echo "	</tr>";