Even more fixes/rewrites due to changed config entries

diff --git a/inc/install-inc.php b/inc/install-inc.php
index a4288ac58035d5e2cec6dcc726b0a78f3a5d4d13..416c0c39b50c3d71831ec16afc804374e426c982 100644 (file)
--- 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 516fd067b88d4000475739764df314b7809bb479..923ffa97bff637e078a5b18280e74a62cea6da6d 100644 (file)
--- 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 94882452fb0d60bc39a23ec47415ca5920d20c05..932405389adaf88a9eb76ae967baf16041191ca0 100644 (file)
--- 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 bd05a13cf7ebaf0d7cf4104c98dd3645e1bbcfbd..2ac1bc51c864fffc886402fbe6f3121448069597 100644 (file)
--- 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 26ce0d869db7ce1e662e2d541839733b1069032a..7e67bf56dd00e4b53b7b1a95bd1801fdcc462993 100644 (file)
--- 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>