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

---
 app/services/app_languages.php  | 20 ++++++++++++++++++++
 app/services/service_delete.php | 14 ++++++++------
 app/services/service_edit.php   | 20 ++++++--------------
 app/services/services.php       | 27 ++++++++++++++-------------
 4 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/app/services/app_languages.php b/app/services/app_languages.php
index c8517d8d30..286cd484b2 100644
--- a/app/services/app_languages.php
+++ b/app/services/app_languages.php
@@ -31,6 +31,16 @@
 	$text['message-delete']['pt-pt'] = "Remoção Efectuada";
 	$text['message-delete']['fr-fr'] = "Supprimé";
 
+	$text['message-add']['en-us'] = "Add Completed";
+	$text['message-add']['es-cl'] = "Agregar Completado";
+	$text['message-add']['pt-pt'] = "Adição Efectuada";
+	$text['message-add']['fr-fr'] = "Ajouté";
+
+	$text['message-update']['en-us'] = "Update Completed";
+	$text['message-update']['es-cl'] = "Actualización Completada";
+	$text['message-update']['pt-pt'] = "Actualização Efectuada";
+	$text['message-update']['fr-fr'] = "Mis à Jour";
+
 	$text['button-back']['en-us'] = "Back";
 	$text['button-back']['es-cl'] = "Volver";
 	$text['button-back']['pt-pt'] = "Voltar";
@@ -56,6 +66,16 @@
 	$text['label-name']['pt-pt'] = "Nome:";
 	$text['label-name']['fr-fr'] = "Nom:";
 
+	$text['message-starting']['en-us'] = "Starting Service";
+	$text['message-starting']['es-cl'] = "Servicio de Inicio";
+	$text['message-starting']['pt-pt'] = "Serviço Começando";
+	$text['message-starting']['fr-fr'] = "Démarrage du Service";
+
+	$text['message-stopping']['en-us'] = "Stopping Service";
+	$text['message-stopping']['es-cl'] = "Servicio de Detención";
+	$text['message-stopping']['pt-pt'] = "Serviço Parando";
+	$text['message-stopping']['fr-fr'] = "Service de L'arrêt";
+
 	$text['description-name']['en-us'] = "Enter the service name.";
 	$text['description-name']['es-cl'] = "Ingrese el nombre del servicio.";
 	$text['description-name']['pt-pt'] = "Introduza o nome do serviço.";
diff --git a/app/services/service_delete.php b/app/services/service_delete.php
index 6ca3731a1e..88129b23e8 100644
--- a/app/services/service_delete.php
+++ b/app/services/service_delete.php
@@ -34,6 +34,12 @@ else {
 	exit;
 }
 
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	}
+
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
 }
@@ -48,12 +54,8 @@ if (count($_GET)>0) {
 	}
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=services.php\">\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: services.php");
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/services/service_edit.php b/app/services/service_edit.php
index c279756da1..493b674e55 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -117,12 +117,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=services.php\">\n";
-				echo "<div align='center'>\n";
-				echo "Add Complete\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-add'];
+				header("Location: services.php");
 				return;
 			} //if ($action == "add")
 
@@ -139,12 +135,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=services.php\">\n";
-				echo "<div align='center'>\n";
-				echo "Update Complete\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: services.php");
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -217,13 +209,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='service_type'>\n";
 	echo "	<option value=''></option>\n";
-	if ($service_type == "pid_file") { 
+	if ($service_type == "pid_file") {
 		echo "	<option value='pid_file' SELECTED >pid file</option>\n";
 	}
 	else {
 		echo "	<option value='pid_file'>pid file</option>\n";
 	}
-	if ($service_type == "php") { 
+	if ($service_type == "php") {
 		echo "	<option value='php' SELECTED >php</option>\n";
 	}
 	else {
diff --git a/app/services/services.php b/app/services/services.php
index cfae5d2dc8..c654adb864 100644
--- a/app/services/services.php
+++ b/app/services/services.php
@@ -33,6 +33,13 @@ else {
 	echo "access denied";
 	exit;
 }
+
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	}
+
 require_once "resources/header.php";
 require_once "resources/paging.php";
 
@@ -59,20 +66,14 @@ if (strlen($_GET["a"]) > 0) {
 	unset ($prep_statement);
 
 	if ($_GET["a"] == "stop") {
-		$msg = 'Service: '.$service_name. ' stopping. ';
+		$_SESSION["message"] = $text['message-stopping'].': '.$service_name;
 		shell_exec($service_cmd_stop);
 	}
 	if ($_GET["a"] == "start") {
-		$msg = 'Service: '.$service_name. ' starting. ';
+		$_SESSION["message"] = $text['message-starting'].': '.$service_name;
 		shell_exec($service_cmd_start);
 	}
-
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"5;url=services.php\">\n";
-	echo "<div align='center'>\n";
-	echo $msg."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	header("Location: services.php");
 	return;
 }
 
@@ -116,9 +117,9 @@ if (strlen($_GET["a"]) > 0) {
 	$rows_per_page = 10;
 	$param = "";
 	$page = $_GET['page'];
-	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
-	list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); 
-	$offset = $rows_per_page * $page; 
+	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
+	list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page);
+	$offset = $rows_per_page * $page;
 
 	$sql = "select * from v_services ";
 	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
@@ -154,7 +155,7 @@ if (strlen($_GET["a"]) > 0) {
 		foreach($result as $row) {
 			echo "<tr >\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row[service_name]."</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row[service_description]."</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row[service_description]."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>\n";
 			$pid = file_get_contents($row[service_data]);
 			if (is_process_running($pid)) {