From a6e439defa8d952b42739f072e5762e515c292bb Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 23 Feb 2014 08:07:37 +0000
Subject: [PATCH] Response message updates, language fixes.

---
 app/schemas/app_languages.php            |  4 ++--
 app/schemas/schema_data_delete.php       | 13 ++++---------
 app/schemas/schema_data_edit.php         | 21 +++++++++------------
 app/schemas/schema_delete.php            | 12 ++----------
 app/schemas/schema_edit.php              | 16 ++++------------
 app/schemas/schema_field_delete.php      |  8 ++------
 app/schemas/schema_field_edit.php        | 16 ++++------------
 app/schemas/schema_name_value_delete.php |  8 ++------
 app/schemas/schema_name_value_edit.php   | 16 ++++------------
 app/schemas/schemas.php                  |  5 ++++-
 10 files changed, 37 insertions(+), 82 deletions(-)

diff --git a/app/schemas/app_languages.php b/app/schemas/app_languages.php
index cab9765667..b2967c8b46 100644
--- a/app/schemas/app_languages.php
+++ b/app/schemas/app_languages.php
@@ -260,8 +260,8 @@ $text['description-parent_schema']['fr-fr'] = "Choisir un schéma parent.";
 
 $text['description-description']['en-us'] = "Enter a description (optional).";
 $text['description-description']['es-cl'] = "Ingrese una descripción (opcional).";
-$text['description-description']['en-us'] = "Introduza uma descrição (opcional).";
-$text['description-description']['fr-fr'] = "";
+$text['description-description']['pt-pt'] = "Introduza uma descrição (opcional).";
+$text['description-description']['fr-fr'] = "Entrez une description (en option).";
 
 $text['description-field_label']['en-us'] = "Enter the field label.";
 $text['description-field_label']['es-cl'] = "Ingrese una etiqueta de campo.";
diff --git a/app/schemas/schema_data_delete.php b/app/schemas/schema_data_delete.php
index 8260f68ccd..dc986f658c 100644
--- a/app/schemas/schema_data_delete.php
+++ b/app/schemas/schema_data_delete.php
@@ -90,19 +90,14 @@ if (count($_GET)>0) {
 		//$lastinsertid = $db->lastInsertId($id);
 		//unset($sql);
 
-	//set the meta redirect
+	//redirect user
+		$_SESSION["message"] = $text['message-delete'];
 		if (strlen($data_parent_row_uuid) == 0) {
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_data_view.php?id=$schema_uuid&data_row_uuid=$data_row_uuid\">\n";
+			header("Location: schema_data_view.php?id=".$schema_uuid."&data_row_uuid=".$data_row_uuid);
 		}
 		else {
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_data_edit.php?schema_uuid=$schema_parent_id&data_row_uuid=$data_parent_row_uuid\">\n";
+			header("Location: schema_data_edit.php?schema_uuid=".$schema_parent_id."&data_row_uuid=".$data_parent_row_uuid);
 		}
-
-	//show a message to the user before the redirect
-		echo "<div align='center'>\n";
-		echo $text['message-delete']."\n";
-		echo "</div>\n";
-		require_once "resources/footer.php";
 		return;
 }
 
diff --git a/app/schemas/schema_data_edit.php b/app/schemas/schema_data_edit.php
index 92745d89bb..d0480b6673 100644
--- a/app/schemas/schema_data_edit.php
+++ b/app/schemas/schema_data_edit.php
@@ -350,23 +350,20 @@ else {
 			$i++;
 		}
 
-		//show the header
-			require_once "resources/header.php";
+		//redirect user
+			if ($action == "add") {
+				$_SESSION["message"] = $text['message-add'];
+			]
+			else if ($action == "update") {
+				$_SESSION["message"] = $text['message-update'];
+			}
 
-		//set the meta redirect
 			if (strlen($data_parent_row_uuid) == 0) {
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_data_edit.php?id=$schema_uuid&data_row_uuid=$data_row_uuid\">\n";
+				header("Location: schema_data_edit.php?id=".$schema_uuid."&data_row_uuid=".$data_row_uuid);
 			}
 			else {
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_data_edit.php?schema_uuid=$schema_parent_id&data_row_uuid=$data_parent_row_uuid\">\n";
+				header("Location: schema_data_edit.php?schema_uuid=".$schema_parent_id."&data_row_uuid=".$data_parent_row_uuid);
 			}
-
-		//show a message to the user before the redirect
-			echo "<div align='center'>\n";
-			if ($action == "add") { echo $text['message-add']."\n"; }
-			if ($action == "update") { echo $text['message-update']."\n"; }
-			echo "</div>\n";
-			require_once "resources/footer.php";
 			return;
 	}
 
diff --git a/app/schemas/schema_delete.php b/app/schemas/schema_delete.php
index 81de980fdc..669133b297 100644
--- a/app/schemas/schema_delete.php
+++ b/app/schemas/schema_delete.php
@@ -45,9 +45,6 @@ else {
 		$id = check_str($_GET["id"]);
 	}
 
-//show the header
-	require_once "resources/header.php";
-
 if (strlen($id) > 0) {
 	$sql = "delete from v_schemas ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
@@ -58,13 +55,8 @@ if (strlen($id) > 0) {
 }
 
 //redirect the user
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=schemas.php\">\n";
-	echo "<div align='center'>\n";
-	echo $text['message-delete']."\n";
-	echo "</div>\n";
-
-//show the footer
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: schemas.php");
 	return;
 
 ?>
diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php
index 1892ff12d1..d84e79c9b1 100644
--- a/app/schemas/schema_edit.php
+++ b/app/schemas/schema_edit.php
@@ -120,12 +120,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=schemas.php\">\n";
-				echo "<div align='center'>\n";
-				echo $text['message-add']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-add'];
+				header("Location: schemas.php");
 				return;
 			} //if ($action == "add")
 
@@ -148,12 +144,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=schemas.php\">\n";
-				echo "<div align='center'>\n";
-				echo $text['message-update']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: schemas.php");
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
diff --git a/app/schemas/schema_field_delete.php b/app/schemas/schema_field_delete.php
index c85d1f9db7..76e3d18d55 100644
--- a/app/schemas/schema_field_delete.php
+++ b/app/schemas/schema_field_delete.php
@@ -57,12 +57,8 @@ else {
 	}
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_edit.php?id=$schema_uuid\">\n";
-	echo "<div align='center'>\n";
-	echo $text['message-delete']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: schema_edit.php?id=".$schema_uuid);
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_field_edit.php b/app/schemas/schema_field_edit.php
index e7fcb03ed7..6dc26813b6 100644
--- a/app/schemas/schema_field_edit.php
+++ b/app/schemas/schema_field_edit.php
@@ -139,12 +139,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_edit.php?id=$schema_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-add']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-add'];
+			header("Location: schema_edit.php?id=".$schema_uuid);
 			return;
 		} //if ($action == "add")
 
@@ -167,12 +163,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_edit.php?id=$schema_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-update']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-update'];
+			header("Location: schema_edit.php?id=".$schema_uuid);
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
diff --git a/app/schemas/schema_name_value_delete.php b/app/schemas/schema_name_value_delete.php
index 4204b42b77..02da862959 100644
--- a/app/schemas/schema_name_value_delete.php
+++ b/app/schemas/schema_name_value_delete.php
@@ -58,12 +58,8 @@ else {
 	}
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_field_edit.php?schema_uuid=$schema_uuid&id=$schema_field_uuid\">\n";
-	echo "<div align='center'>\n";
-	echo $text['message-delete']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: schema_field_edit.php?schema_uuid=".$schema_uuid."&id=".$schema_field_uuid);
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_name_value_edit.php b/app/schemas/schema_name_value_edit.php
index 75fb35d40f..70e3c56a21 100644
--- a/app/schemas/schema_name_value_edit.php
+++ b/app/schemas/schema_name_value_edit.php
@@ -112,12 +112,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_field_edit.php?schema_uuid=$schema_uuid&id=$schema_field_uuid\">\n";
-				echo "<div align='center'>\n";
-				echo $text['message-add']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-add'];
+				header("Location: schema_field_edit.php?schema_uuid=".$schema_uuid."&id=".$schema_field_uuid);
 				return;
 			} //if ($action == "add")
 
@@ -132,12 +128,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_field_edit.php?schema_uuid=$schema_uuid&id=$schema_field_uuid\">\n";
-				echo "<div align='center'>\n";
-				echo $text['message-update']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: schema_field_edit.php?schema_uuid=".$schema_uuid."&id=".$schema_field_uuid);
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
diff --git a/app/schemas/schemas.php b/app/schemas/schemas.php
index 2d9bd91db2..452ccba1c7 100644
--- a/app/schemas/schemas.php
+++ b/app/schemas/schemas.php
@@ -125,9 +125,12 @@ require_once "resources/paging.php";
 			if ($row['schema_auth'] == 'yes') {
 				echo $text['option-true'];
 			}
-			else if ($row['schema_auth'] == 'false') {
+			else if ($row['schema_auth'] == 'no') {
 				echo $text['option-false'];
 			}
+			else {
+				echo "&nbsp;";
+			}
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['schema_description']."&nbsp;</td>\n";
 			echo "	<td valign='top' align='right'>\n";