From f50268c80613bd2b982c3f87cb60c4cc5ae0453c Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sun, 1 Dec 2013 18:37:17 +0100
Subject: [PATCH] update lng-files (thx oschn0r) and fixed dropdown of
 default-php-config in fcgid/fpm settings (thx Sephi)

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 .../froxlor/function.getPhpConfigs.php          | 17 ++++++++++-------
 lng/english.lng.php                             |  6 +++---
 lng/german.lng.php                              |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/functions/froxlor/function.getPhpConfigs.php b/lib/functions/froxlor/function.getPhpConfigs.php
index 4645ac1d..522c64bd 100644
--- a/lib/functions/froxlor/function.getPhpConfigs.php
+++ b/lib/functions/froxlor/function.getPhpConfigs.php
@@ -16,23 +16,26 @@
  */
 
 /**
- * returns an array for the settings-array
- * 
+ * returns an array of existing php-configurations
+ * in our database for the settings-array
+ *
  * @return array
  */
 function getPhpConfigs() {
 
-	$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
-	$result = Database::pexecute_first($result_stmt, null, false);
 	$configs_array = array();
 
-	// if the table does not yet exist, we just use the default php.ini
-	if ($result == false) {
+	// check if table exists because this is used in a preconfig
+	// where the tables possibly does not exist yet
+	$results = Database::query("SHOW TABLES LIKE '".TABLE_PANEL_PHPCONFIGS."'");
+	if (!$results) {
 		$configs_array[1] = 'Default php.ini';
 	} else {
+		// get all configs
+		$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			if (!isset($configs_array[$row['id']])
-				&& !in_array($row['id'], $configs_array)
+					&& !in_array($row['id'], $configs_array)
 			) {
 				$configs_array[$row['id']] = html_entity_decode($row['description']);
 			}
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 02308910..c26d4987 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1983,7 +1983,7 @@ $lng['error']['send_report_title'] = 'Send error report';
 $lng['error']['send_report_desc'] = 'Thank you for reporting this error and helping us to froxlor improve froxlor.<br />This is the email which will be sent to the froxlor developer team:';
 $lng['error']['send_report'] = 'Send report';
 $lng['error']['notallowedtouseaccounts'] = 'Your account does not allow using IMAP/POP3. You cannot add email accounts.';
-$lng['pwdreminder']['changed'] = 'Your password has been successfully changed. You can now login using this password.';
-$lng['pwdreminder']['wrongcode'] = 'Sorry, the used activationcode does not exist or is already expired.';
+$lng['pwdreminder']['changed'] = 'Your password has been updated successfully. You can now login with your new password.';
+$lng['pwdreminder']['wrongcode'] = 'Sorry, your activation-code does not exist or has already expired.';
 $lng['admin']['templates']['LINK'] = 'Replaced with the customers password reset link.';
-$lng['pwdreminder']['choosenew'] = 'Choose new password';
+$lng['pwdreminder']['choosenew'] = 'Set new password';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 7dab486f..a4abd03e 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1709,7 +1709,7 @@ $lng['error']['send_report_title'] = 'Fehler melden';
 $lng['error']['send_report_desc'] = 'Danke, dass Sie uns diesen Fehler melden und damit helfen Froxlor zu verbessern.<br />Folgender Bericht wird per Mail an das Froxlor Entwickler Team gesendet.';
 $lng['error']['send_report'] = 'Fehlerbericht senden';
 $lng['error']['notallowedtouseaccounts'] = 'Ihrem Konto ist die Nutzung von IMAP/POP3 nicht erlaubt, daher können keine E-Mail Konten angelegt werden';
-$lng['pwdreminder']['changed'] = 'Ihr Passwort wurde erfolgreich geändert. Sie können sich nun damit ';
+$lng['pwdreminder']['changed'] = 'Ihr Passwort wurde erfolgreich geändert. Sie können sich nun damit anmelden.';
 $lng['pwdreminder']['wrongcode'] = 'Der verwendete Aktivierungscode ist entweder nicht gültig oder bereits abgelaufen.';
 $lng['admin']['templates']['LINK'] = 'Wird mit dem Link zum Zurücksetzen des Passworts ersetzt.';
 $lng['pwdreminder']['choosenew'] = 'Neues Passwort auswählen';