From e6766e4386b48732a43282c1ffd23e176cbb8949 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 6 Jul 2010 07:15:45 +0000
Subject: [PATCH] Even more fixes/rewrites due to changed config entries

---
 inc/install-inc.php                             | 6 +++++-
 inc/modules/admin/what-config_beg.php           | 2 +-
 inc/modules/admin/what-config_proxy.php         | 2 +-
 templates/de/html/admin/admin_config_active.tpl | 4 ++--
 templates/de/html/admin/admin_config_beg.tpl    | 8 ++++----
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/inc/install-inc.php b/inc/install-inc.php
index a4288ac580..416c0c39b5 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -192,8 +192,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 				// You have submitted data then we have to reset the SQLs
 				initSqls();
 
-				// Connect to MySQL server
+				// Restore PHPs error handler to prevent ours to handle errors,
+				// e.g. failed connection attempts. We want to handle them on
+				// our own.
 				restore_error_handler();
+
+				// Connect to MySQL server
 				SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
 
 				// Is the link up?
diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index 516fd067b8..923ffa97bf 100644
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -69,7 +69,7 @@ if (isFormSent()) {
 	$content['wait_selection']   = createTimeSelections(getConfig('beg_notify_wait')   , 'beg_notify_wait'   , 'ms' );
 
 	// Init all Y/N selections
-	foreach (array('rallye', 'active', 'mode', 'ral_enable_notify', 'ral_disable_notify', 'new_member_notify', 'include_own') as $entry) {
+	foreach (array('rallye', 'active', 'mode', 'rallye_enable_notify', 'rallye_disable_notify', 'new_member_notify', 'include_own') as $entry) {
 		$content[$entry . '_y'] = '';
 		$content[$entry . '_n'] = '';
 		$content[$entry . '_' . strtolower(getConfig('beg_' . $entry))] = ' checked="checked"';
diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php
index 94882452fb..932405389a 100644
--- a/inc/modules/admin/what-config_proxy.php
+++ b/inc/modules/admin/what-config_proxy.php
@@ -56,7 +56,7 @@ if (isFormSent()) {
 	}
 } else {
 	// Load template
-	loadTemplate('admin_config_proxy', false, $content);
+	loadTemplate('admin_config_proxy');
 }
 
 // [EOF]
diff --git a/templates/de/html/admin/admin_config_active.tpl b/templates/de/html/admin/admin_config_active.tpl
index bd05a13cf7..2ac1bc51c8 100644
--- a/templates/de/html/admin/admin_config_active.tpl
+++ b/templates/de/html/admin/admin_config_active.tpl
@@ -7,8 +7,8 @@
 		</td>
 	</tr>
 	<tr>
-		<td align="right">{--ADMIN_ACTIVE_LIMIT--}:</td>
-		<td align="center">
+		<td class="bottom" align="right">{--ADMIN_ACTIVE_LIMIT--}:</td>
+		<td class="bottom" align="center">
 			<input type="input" name="active_limit" class="admin_normal" value="{?active_limit?}" size="5" maxlength="20" />
 		</td>
 	</tr>
diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl
index 26ce0d869d..7e67bf56dd 100644
--- a/templates/de/html/admin/admin_config_beg.tpl
+++ b/templates/de/html/admin/admin_config_beg.tpl
@@ -128,8 +128,8 @@
 			{--ADMIN_BEG_RAL_ENABLE_NOTIFY--}
 		</td>
 		<td align="center">
-			<input type="radio" name="beg_ral_enable_notify" class="admin_normal" value="Y"$content[ral_enable_notify_y] /> {--YES--}<br />
-			<input type="radio" name="beg_ral_enable_notify" class="admin_normal" value="N"$content[ral_enable_notify_n] /> {--NO--}
+			<input type="radio" name="beg_rallye_enable_notify" class="admin_normal" value="Y"$content[rallye_enable_notify_y] /> {--YES--}<br />
+			<input type="radio" name="beg_rallye_enable_notify" class="admin_normal" value="N"$content[rallye_enable_notify_n] /> {--NO--}
 		</td>
 	</tr>
 	<tr>
@@ -137,8 +137,8 @@
 			{--ADMIN_BEG_RAL_DISABLE_NOTIFY--}
 		</td>
 		<td align="center">
-			<input type="radio" name="beg_ral_disable_notify" class="admin_normal" value="Y"$content[ral_disable_notify_y] /> {--YES--}<br />
-			<input type="radio" name="beg_ral_disable_notify" class="admin_normal" value="N"$content[ral_disable_notify_n] /> {--NO--}
+			<input type="radio" name="beg_rallye_disable_notify" class="admin_normal" value="Y"$content[rallye_disable_notify_y] /> {--YES--}<br />
+			<input type="radio" name="beg_rallye_disable_notify" class="admin_normal" value="N"$content[rallye_disable_notify_n] /> {--NO--}
 		</td>
 	</tr>
 	<tr>
-- 
2.39.5