Browse Source

Fix Group (Permissions) Copy.

Nate Jones 11 years ago
parent
commit
7887e5c264
3 changed files with 108 additions and 70 deletions
  1. 20 0
      core/users/app_languages.php
  2. 17 1
      core/users/group_permissions.php
  3. 71 69
      core/users/permissions_copy.php

+ 20 - 0
core/users/app_languages.php

@@ -357,6 +357,16 @@
 	$text['message-delete']['pt-pt'] = "Remoção Efectuada";
 	$text['message-delete']['pt-pt'] = "Remoção Efectuada";
 	$text['message-delete']['fr-fr'] = "Supprimé";
 	$text['message-delete']['fr-fr'] = "Supprimé";
 
 
+	$text['message-delete']['en-us'] = "Delete Completed";
+	$text['message-delete']['es-cl'] = "Eliminación Completada";
+	$text['message-delete']['pt-pt'] = "Remoção Efectuada";
+	$text['message-delete']['fr-fr'] = "Supprimé";
+
+	$text['message-copy']['en-us'] = "Copy Completed";
+	$text['message-copy']['es-cl'] = "Copia Completada";
+	$text['message-copy']['pt-pt'] = "Cópia Efectuada";
+	$text['message-copy']['fr-fr'] = "Copié";
+
 	$text['message-restore']['en-us'] = "Restore Completed";
 	$text['message-restore']['en-us'] = "Restore Completed";
 	$text['message-restore']['es-cl'] = "Restauración Completada";
 	$text['message-restore']['es-cl'] = "Restauración Completada";
 	$text['message-restore']['pt-pt'] = "Restauração Efectuada";
 	$text['message-restore']['pt-pt'] = "Restauração Efectuada";
@@ -377,4 +387,14 @@
 	$text['message-password_mismatch']['pt-pt'] = "As passwords não correspondem.";
 	$text['message-password_mismatch']['pt-pt'] = "As passwords não correspondem.";
 	$text['message-password_mismatch']['fr-fr'] = "les mots de passe ne correspondent pas";
 	$text['message-password_mismatch']['fr-fr'] = "les mots de passe ne correspondent pas";
 
 
+	$text['message-new_group_name']['en-us'] = "Enter a Name for the new Group...";
+	$text['message-new_group_name']['es-cl'] = "Introduzca un Nombre para el nuevo Grupo...";
+	$text['message-new_group_name']['pt-pt'] = "Digite um Nome para o novo Grupo...";
+	$text['message-new_group_name']['fr-fr'] = "Entrez un Nom pour le nouveau Groupe...";
+
+	$text['message-new_group_description']['en-us'] = "Enter a Description for the new Group...";
+	$text['message-new_group_description']['es-cl'] = "Introduzca una Descripción para el nuevo Grupo...";
+	$text['message-new_group_description']['pt-pt'] = "Digite uma Descrição para o novo grupo...";
+	$text['message-new_group_description']['fr-fr'] = "Entrez une Description pour le nouveau groupe...";
+
 ?>
 ?>

+ 17 - 1
core/users/group_permissions.php

@@ -310,6 +310,22 @@ require_once "resources/paging.php";
 		return;
 		return;
 	}
 	}
 
 
+// copy group javascript
+
+	echo "<script language='javascript' type='text/javascript'>\n";
+	echo "	function copy_group() {\n";
+	echo "		var new_group_name;\n";
+	echo "		var new_group_desc;\n";
+	echo "		new_group_name = prompt('".$text['message-new_group_name']."');\n";
+	echo "		if (new_group_name != null) {\n";
+	echo "			new_group_desc = prompt('".$text['message-new_group_description']."');\n";
+	echo "			if (new_group_desc != null) {\n";
+	echo "				window.location = 'permissions_copy.php?group_name=".$group_name."&new_group_name=' + new_group_name + '&new_group_desc=' + new_group_desc;\n";
+	echo "			}\n";
+	echo "		}\n";
+	echo "	}\n";
+	echo "</script>\n";
+
 //show the content
 //show the content
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<div align='center'>";
 	echo "<div align='center'>";
@@ -322,7 +338,7 @@ require_once "resources/paging.php";
 	echo "<td width='50%' align=\"left\" nowrap=\"nowrap\"><b>".$text['header-group_permissions'].$group_name."</b></td>\n";
 	echo "<td width='50%' align=\"left\" nowrap=\"nowrap\"><b>".$text['header-group_permissions'].$group_name."</b></td>\n";
 	echo "<td width='50%' align=\"right\">\n";
 	echo "<td width='50%' align=\"right\">\n";
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='groups.php'\" value='".$text['button-back']."'> ";
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='groups.php'\" value='".$text['button-back']."'> ";
-	echo "	<input type='button' class='btn' alt='".$text['button-copy']."' onclick=\"var new_ext = prompt('".$text['message_extension']."'); if (new_ext != null) { window.location='permissions_copy.php?id=".$group_name."&ext=' + new_ext; }\" value='".$text['button-copy']."'>";
+	echo "	<input type='button' class='btn' alt='".$text['button-copy']."' onclick='copy_group();' value='".$text['button-copy']."'>";
 	echo "</td>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
 	echo "<tr>\n";

+ 71 - 69
core/users/permissions_copy.php

@@ -42,81 +42,83 @@ else {
 	}
 	}
 
 
 //set the http get/post variable(s) to a php variable
 //set the http get/post variable(s) to a php variable
-	if (isset($_REQUEST["id"]) && isset($_REQUEST["ext"])) {
-		$group_name = check_str($_REQUEST["id"]);
-		$group_new = check_str($_REQUEST["ext"]);
-	}
+if (isset($_REQUEST["group_name"]) && isset($_REQUEST["new_group_name"])) {
 
 
-//get the groups data
-	$sql = "select * from v_groups ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and group_name = '$group_name' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach ($result as &$row) {
-		$domain_uuid = $row["domain_uuid"];
-		$group_description = $row["group_description"];
-		$group_name = $row["group_name"];
-	}
-	unset ($prep_statement);
-
-	//copy the groups
-	$group_uuid = uuid();
-	$sql = "insert into v_groups ";
-	$sql .= "(";
-	$sql .= "group_uuid, ";
-	$sql .= "domain_uuid, ";
-	$sql .= "group_name, ";
-	$sql .= "group_description ";
-	$sql .= ")";
-	$sql .= "values ";
-	$sql .= "(";
-	$sql .= "'$group_uuid', ";
-	$sql .= "'$domain_uuid', ";
-	$sql .= "'$group_new', ";
-	$sql .= "'copy_$group_description' ";
-	$sql .= ")";
-	$db->exec(check_sql($sql));
-	unset($sql);
-
-
-//get the group permissions data
-	$sql = "select * from v_group_permissions ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and group_name = '$group_name' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach ($result as &$row) {
-		$domain_uuid = $row["domain_uuid"];
-		$permission_name = $row["permission_name"];
-		$group_name = $row["group_name"];
+	$group_name = check_str($_REQUEST["group_name"]);
+	$new_group_name = check_str($_REQUEST["new_group_name"]);
+	$new_group_desc = check_str($_REQUEST["new_group_desc"]);
 
 
-		//copy the group permissions
-		$group_permission_uuid = uuid();
-		$sql = "insert into v_group_permissions ";
-		$sql .= "(";
-		$sql .= "group_permission_uuid, ";
+	//get the groups data
+		$sql = "select * from v_groups ";
+		$sql .= "where domain_uuid = '".$domain_uuid."' ";
+		$sql .= "and group_name = '".$group_name."' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		foreach ($result as &$row) {
+			$domain_uuid = $row["domain_uuid"];
+			$group_name = $row["group_name"];
+		}
+		unset ($prep_statement);
+
+	//create new group
+		$group_uuid = uuid();
+		$sql = "insert into v_groups ";
+		$sql .= "( ";
+		$sql .= "group_uuid, ";
 		$sql .= "domain_uuid, ";
 		$sql .= "domain_uuid, ";
-		$sql .= "permission_name, ";
-		$sql .= "group_name ";
-		$sql .= ")";
+		$sql .= "group_name, ";
+		$sql .= "group_description ";
+		$sql .= ") ";
 		$sql .= "values ";
 		$sql .= "values ";
-		$sql .= "(";
-		$sql .= "'$group_permission_uuid', ";
-		$sql .= "'$domain_uuid', ";
-		$sql .= "'$permission_name', ";
-		$sql .= "'$group_new' ";
-		$sql .= ")";
+		$sql .= "( ";
+		$sql .= "'".$group_uuid."', ";
+		$sql .= "'".$domain_uuid."', ";
+		$sql .= "'".$new_group_name."', ";
+		$sql .= "'".$new_group_desc."' ";
+		$sql .= ") ";
 		$db->exec(check_sql($sql));
 		$db->exec(check_sql($sql));
 		unset($sql);
 		unset($sql);
-	}
-	unset ($prep_statement);
 
 
-//redirect the user
-	$_SESSION["message"] = $text['message-copy'];
-	header("Location: groups.php");
-	return;
+	//get the group permissions data
+		$sql = "select * from v_group_permissions ";
+		$sql .= "where domain_uuid = '".$domain_uuid."' ";
+		$sql .= "and group_name = '".$group_name."' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		foreach ($result as &$row) {
+			$domain_uuid = $row["domain_uuid"];
+			$permission_name = $row["permission_name"];
+			$group_name = $row["group_name"];
+
+		//copy the group permissions
+			$group_permission_uuid = uuid();
+			$sql = "insert into v_group_permissions ";
+			$sql .= "( ";
+			$sql .= "group_permission_uuid, ";
+			$sql .= "domain_uuid, ";
+			$sql .= "permission_name, ";
+			$sql .= "group_name ";
+			$sql .= ") ";
+			$sql .= "values ";
+			$sql .= "( ";
+			$sql .= "'".$group_permission_uuid."', ";
+			$sql .= "'".$domain_uuid."', ";
+			$sql .= "'".$permission_name."', ";
+			$sql .= "'".$new_group_name."' ";
+			$sql .= ") ";
+			$db->exec(check_sql($sql));
+			unset($sql);
+		}
+		unset ($prep_statement);
+
+	//redirect the user
+		$_SESSION["message"] = $text['message-copy'];
+
+}
+
+header("Location: groups.php");
+return;
 
 
 ?>
 ?>