Naming convention applied on language strings, check added to wrapper:
authorRoland Häder <roland@mxchange.org>
Wed, 28 Jul 2010 20:28:53 +0000 (20:28 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 28 Jul 2010 20:28:53 +0000 (20:28 +0000)
- Naming convention applied on more language strings
- Check added to wrapper function ifPostContainsSelections() to make sure the
  form is really sent
- TODOs.txt updated

31 files changed:
DOCS/TODOs.txt
inc/language/doubler_de.php
inc/language/optimize_de.php
inc/language/order_de.php
inc/language/register_de.php
inc/language/rewrite_de.php
inc/language/task_de.php
inc/language/top10_de.php
inc/language/user_de.php
inc/libs/doubler_functions.php
inc/libs/order_functions.php
inc/libs/register_functions.php
inc/mails/doubler_mails.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-config_register.php
inc/modules/admin/what-del_holiday.php
inc/modules/admin/what-edit_user.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-optimize.php
inc/mysql-manager.php
inc/wrapper-functions.php
templates/de/html/admin/admin_config_register.tpl
templates/de/html/admin/admin_config_rewrite.tpl
templates/de/html/admin/admin_config_top10.tpl
templates/de/html/admin/admin_config_user.tpl
templates/de/html/admin/admin_list_task_delete.tpl
templates/de/html/admin/admin_list_user_pagenav.tpl
templates/de/html/admin/admin_optimize.tpl
templates/de/html/doubler/doubler_reflink.tpl
templates/de/html/guest/guest_register.tpl
templates/de/html/member/member_doubler.tpl

index bac6435..b182f96 100644 (file)
 ./inc/modules/member/what-unconfirmed.php:143: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/order.php:76:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:69:    // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1170:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1417:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1515:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1882:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1926:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1173:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1420:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1518:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1885:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1929:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:370:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:46:// @TODO Can we cache this?
 ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye
index 3d6dee9..758ef83 100644 (file)
@@ -114,7 +114,7 @@ addMessages(array(
        'DOUBLER_FORM_POINTS_MIN' => "Zu wenig {?POINTS?} zum Verdoppeln eingegeben.",
        'DOUBLER_FORM_POINTS_MAX' => "Zu viele {?POINTS?} zum Verdoppeln eingegeben.",
        'DOUBLER_FORM_NO_POINTS_LEFT' => "Sie haben nicht ausreichend {?POINTS?} &uuml;brig.",
-       'DOUBLER_MEMBER_SUBJECT' => "Gutschrift durch Verdoppelung",
+       'MEMBER_DOUBLER_SUBJECT' => "Gutschrift durch Verdoppelung",
        'DOUBLER_PAYOUT_TIME_DIRECT' => "Die Auszahlung erfolgt unmittelbar, nachdem gen&uuml;gend {?POINTS?} zusammengekommen sind, um Ihnen die Verdoppelung auszuzahlen.",
        'DOUBLER_PAYOUT_TIME_RESET' => "Abends um 00:00 Uhr jeden Tages wird gepr&uuml;ft, ob gen&uuml;gend {?POINTS?} zusammengekommen sind, um Ihnen die Verdoppelung auszuzahlen.",
        'DOUBLER_PAYOUT_TIME_UNKNOWN' => "Unbebannter Modus <span class=\"data\">%s</span> erkannt. Bitte Bug melden.",
@@ -125,13 +125,13 @@ addMessages(array(
        'DOUBLER_REGISTER_ADVERT' => "Weiter zur Anmeldung / Werbebuchung",
        'DOUBLER_NEXT_PAYOUT' => "Die als n&auml;chstes anstehenden Auszahlungen",
        'DOUBLER_WANNA_TRY' => "Wollen Sie mal ausprobieren?",
-       'DOUBLER_GUEST_NO_ENTRIES_FOUND' => "In dieser Kategorie hat noch kein Mitglied einen Eintrag.",
-       'DOUBLER_MEMBER_NO_ENTRIES_FOUND' => "In dieser Kategorie haben Sie noch keine Eintr&auml;ge.",
-       'DOUBLER_MEMBER_ALREADY_PAYOUT' => "An Sie bereits ausgezahlte Verdoppelungen",
-       'DOUBLER_MEMBER_NEXT_PAYOUT' => "Sie erhalten bald folgende Verdoppelungen ausgezahlt",
-       'DOUBLER_MEMBER_REFERAL_PAYOUT' => "Ihr Refferal-Verdienst",
-       'DOUBLER_MEMBER_YOUR_LINK' => "Hier ist Ihr Verdoppler-Link",
-       'DOUBLER_MEMBER_YOUR_REFERAL_LINK' => "Ihr Referal-Link zum Verdoppeln",
+       'GUEST_DOUBLER_NO_ENTRIES_FOUND' => "In dieser Kategorie hat noch kein Mitglied einen Eintrag.",
+       'MEMBER_DOUBLER_NO_ENTRIES_FOUND' => "In dieser Kategorie haben Sie noch keine Eintr&auml;ge.",
+       'MEMBER_DOUBLER_ALREADY_PAYOUT' => "An Sie bereits ausgezahlte Verdoppelungen",
+       'MEMBER_DOUBLER_NEXT_PAYOUT' => "Sie erhalten bald folgende Verdoppelungen ausgezahlt",
+       'MEMBER_DOUBLER_REFERAL_PAYOUT' => "Ihr Refferal-Verdienst",
+       'MEMBER_DOUBLER_YOUR_LINK' => "Hier ist Ihr Verdoppler-Link",
+       'MEMBER_DOUBLER_YOUR_REFERAL_LINK' => "Ihr Referal-Link zum Verdoppeln",
        'DOUBLER_POINTS_LEFT' => "Es stehen noch <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> zum Verdoppeln zur Verf&uuml;gung.",
        'DOUBLER_USAGE_COUNTER' => "Der Verdoppler wurde bereits <strong>{%config,translateComma=doubler_counter%}</strong> mal genutzt.",
        'MEMBER_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.",
index 441b99d..e536fc7 100644 (file)
@@ -44,22 +44,22 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'OPTIMIZE_DBNAME' => "Tabelle",
-       'OPTIMIZE_REPAIRED' => "Repariert",
-       'OPTIMIZE_OPTIMIZED' => "Optimiert",
-       'OPTIMIZE_TOTAL_SIZE' => "Gesamtgr&ouml;sse",
-       'OPTIMIZE_GAIN_SIZE' => "Eingespart",
-       'OPTIMIZE_STATUS_OK' => "Nein",
-       'OPTIMIZE_STATUS_TABLE_DOES_NOT_SUPPORT_OPTIMIZE_DOING_RECREATE_ANALYZE_INSTEAD' => "Keine Unterst&uuml;tzung (1)",
-       'OPTIMIZE_STATUS_THE_STORAGE_ENGINE_FOR_THE_TABLE_DOESNT_SUPPORT_OPTIMIZE' => "Keine Unterst&uuml;tzung (2)",
-       'OPTIMIZE_STATUS_UNSUPPORTED' => "Nicht m&ouml;glich",
-       'OPTIMIZE_STATUS_OPTIMIZED' => "Optimiert.",
-       'OPTIMIZE_DB_TOTAL_TABLES' => "Gesamtzahl angelegter Tabellen",
-       'OPTIMIZE_DB_TOTAL_SIZE' => "Gesamtgr&ouml;&szlig;e der Datenbank",
-       'OPTIMIZE_DB_TOTAL_OPTIMIZE' => "Aufrufe der Optimierungsfunktion",
-       'OPTIMIZE_DB_TOTAL_GAIN_SIZE' => "Diesen Durchlauf eingespart",
-       'OPTIMIZE_DB_TOTAL_GAIN_TABLES' => "Diesen Durchlauf optimierte Tabellen",
-       'OPTIMIZE_DB_TOTAL_OPTI' => "Gesamteinsparnisse",
+       'ADMIN_OPTIMIZE_DBNAME' => "Tabelle",
+       'ADMIN_OPTIMIZE_REPAIRED' => "Repariert",
+       'ADMIN_OPTIMIZE_OPTIMIZED' => "Optimiert",
+       'ADMIN_OPTIMIZE_TOTAL_SIZE' => "Gesamtgr&ouml;sse",
+       'ADMIN_OPTIMIZE_GAIN_SIZE' => "Eingespart",
+       'ADMIN_OPTIMIZE_STATUS_OK' => "Nein",
+       'ADMIN_OPTIMIZE_STATUS_TABLE_DOES_NOT_SUPPORT_ADMIN_OPTIMIZE_DOING_RECREATE_ANALYZE_INSTEAD' => "Keine Unterst&uuml;tzung (1)",
+       'ADMIN_OPTIMIZE_STATUS_THE_STORAGE_ENGINE_FOR_THE_TABLE_DOESNT_SUPPORT_OPTIMIZE' => "Keine Unterst&uuml;tzung (2)",
+       'ADMIN_OPTIMIZE_STATUS_UNSUPPORTED' => "Nicht m&ouml;glich",
+       'ADMIN_OPTIMIZE_STATUS_OPTIMIZED' => "Optimiert.",
+       'ADMIN_OPTIMIZE_DB_TOTAL_TABLES' => "Gesamtzahl angelegter Tabellen",
+       'ADMIN_OPTIMIZE_DB_TOTAL_SIZE' => "Gesamtgr&ouml;&szlig;e der Datenbank",
+       'ADMIN_OPTIMIZE_DB_TOTAL_OPTIMIZE' => "Aufrufe der Optimierungsfunktion",
+       'ADMIN_OPTIMIZE_DB_TOTAL_GAIN_SIZE' => "Diesen Durchlauf eingespart",
+       'ADMIN_OPTIMIZE_DB_TOTAL_GAIN_TABLES' => "Diesen Durchlauf optimierte Tabellen",
+       'ADMIN_OPTIMIZE_DB_TOTAL_OPTI' => "Gesamteinsparnisse",
 ));
 
 // [EOF]
index 0d63e46..e1ad4c6 100644 (file)
@@ -67,15 +67,15 @@ addMessages(array(
        'MEMBER_ENTER_INVALID_URL' => "Ung&uuml;tige URL eingegeben.",
        'MEMBER_NO_MAIL_TYPE_SELECTED' => "Bitte w&auml;hlen Sie eine Mailart aus.",
 
-       'ORDER_SELECT_COLUMN_USERID' => "Mitgliedsnummer",
-       'ORDER_SELECT_COLUMN_ZIP' => "Postleitzahl",
-       'ORDER_SELECT_COLUMN_COUNTRY' => "Land",
-       'ORDER_SELECT_COLUMN_EMAIL' => "EMail-Adresse",
-       'ORDER_SELECT_COLUMN_BIRTH_YEAR' => "Geburtsjahr",
-       'ORDER_SELECT_COLUMN_LAST_ONLINE' => "Als letztes Online",
-       'ORDER_SELECT_COLUMN_REFERAL_CLICKS' => "Klicks auf Ref-Link",
-       'ORDER_SELECT_COLUMN_TOTAL_LOGINS' => "Gesamtlogins",
-       'ORDER_SELECT_COLUMN_MAIL_ORDERS' => "Heutige Mailbuchungen",
+       'ADMIN_ORDER_SELECT_COLUMN_USERID' => "Mitgliedsnummer",
+       'ADMIN_ORDER_SELECT_COLUMN_ZIP' => "Postleitzahl",
+       'ADMIN_ORDER_SELECT_COLUMN_COUNTRY' => "Land",
+       'ADMIN_ORDER_SELECT_COLUMN_EMAIL' => "EMail-Adresse",
+       'ADMIN_ORDER_SELECT_COLUMN_BIRTH_YEAR' => "Geburtsjahr",
+       'ADMIN_ORDER_SELECT_COLUMN_LAST_ONLINE' => "Als letztes Online",
+       'ADMIN_ORDER_SELECT_COLUMN_REFERAL_CLICKS' => "Klicks auf Ref-Link",
+       'ADMIN_ORDER_SELECT_COLUMN_TOTAL_LOGINS' => "Gesamtlogins",
+       'ADMIN_ORDER_SELECT_COLUMN_MAIL_ORDERS' => "Heutige Mailbuchungen",
 
        'ORDER_DEFAULT_SUBJECT' => "Betreffzeile in allen Mails",
        'ORDER_DEFAULT_TEXT'    => "Geben Sie hier Ihren Werbetext ein.",
index 212cf4b..3730f58 100644 (file)
@@ -44,12 +44,12 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'REGISTER_MUST_SET_NOTE' => "Sind Pflichtangaben, ansonsten erfolgt keine Anmeldung.",
-       'REGISTER_MUST_HEADER' => "Pflichtfelder einstellen",
-       'REGISTER_CHANGE_MUST' => "Einstellungen &auml;ndern",
-       'REGISTER_FIELD_NAME' => "Eingabefeld",
-       'REGISTER_FIELD_REQUIRED' => "Pflichtfeld?",
-       'REGISTER_ADMIN_CHANGES_SAVED' => "Es wurden <span class=\"data\">%s</span> Pflichtfelder aktualisiert.",
+       'GUEST_REGISTER_MUST_SET_NOTE' => "Sind Pflichtangaben, ansonsten erfolgt keine Anmeldung.",
+       'ADMIN_CONFIG_REGISTER_MUST_TITLE' => "Pflichtfelder einstellen",
+       'ADMIN_REGISTER_CHANGE_MUST' => "Einstellungen &auml;ndern",
+       'ADMIN_REGISTER_FIELD_NAME' => "Eingabefeld",
+       'ADMIN_REGISTER_FIELD_REQUIRED' => "Pflichtfeld?",
+       'ADMIN_REGISTER_CHANGES_SAVED' => "Es wurden <span class=\"data\">%s</span> Pflichtfelder aktualisiert.",
        'REGISTER_SURNAME_REQUIRED' => "Bitte geben Sie Ihren Vornamen ein.",
        'REGISTER_FAMILY_REQUIRED' => "Bitte geben Sie Ihren Nachnamen ein.",
        'REGISTER_STREET_NR_REQUIRED' => "Bitte geben Sie Stra&szlig;e und Hausnummer ein.",
index 1b385c8..64e5379 100644 (file)
@@ -44,9 +44,9 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'MODULE_NAME' => "Modulname",
-       'MODULE_TITLE' => "Modultitel",
-       'MODULE_SKIPPED' => "Modul wird ausgeblendet",
+       'ADMIN_MODULE_NAME' => "Modulname",
+       'ADMIN_MODULE_TITLE' => "Modultitel",
+       'ADMIN_MODULE_SKIPPED' => "Modul wird ausgeblendet",
        'ADMIN_CONFIG_REWRITE_NOTE' => "Stellen Sie hier die Module ein, die von der Rewrite-Engine nicht auf die suchmaschienenoptimierten URLs umgeschrieben werden sollen. Die ist im Regelfall nur das Modul <u>index</u>.",
 ));
 
index 9e617ec..ef4e0a5 100644 (file)
@@ -72,7 +72,7 @@ addMessages(array(
        'ADMIN_OVERVIEW_TASK_DELETED_TYPE' => "Als zu l&ouml;schende markierte Aufgaben",
        'ADMIN_OVERVIEW_TASK_CLOSED_TYPE' => "Ihre geschlossenen Aufgaben",
        'ADMIN_TASK_DELETE_ENTRIES' => "Sofort l&ouml;schen",
-       'TASK_DELETE_MODE_NOTE' => "Diese Aufgaben sind zum automatischen L&ouml;schen freigegeben. Die automatische L&ouml;schung erfolgt durch die autopurge-Erweiterung. Sie k&ouml;nnen die Aufgaben aber auch jetzt endg&uuml;ltig l&ouml;schen.",
+       'ADMIN_TASK_DELETE_MODE_NOTE' => "Diese Aufgaben sind zum automatischen L&ouml;schen freigegeben. Die automatische L&ouml;schung erfolgt durch die autopurge-Erweiterung. Sie k&ouml;nnen die Aufgaben aber auch jetzt endg&uuml;ltig l&ouml;schen.",
        'ADMIN_TASK_UNKNOWN_LIST_TITLE' => "Linktitel nicht gesetzt.",
        'ADMIN_TASK_INACTIVE_AUTOPURGE' => "Inaktive Accounts",
        'ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE' => "Es gibt inaktiv gewordene Mitglieder in Ihrem {?mt_word?}.",
index 7d3b6a6..0cb62bf 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_TOP10_CONFIG_HEADER' => "Einstellungen an TOP-Listen",
+       'ADMIN_CONFIG_TOP10_TITLE' => "Einstellungen an TOP-Listen",
        'ADMIN_TOP10_MAX_TOP10' => "Maximale Pl&auml;tze pro Liste",
 ));
 
index e7cd719..fd24b2e 100644 (file)
@@ -44,14 +44,14 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'USER_PAGENAV' => "Seiten",
-       'USER_ADMIN_CONFIG_HEADER' => "Konfiguration - Mitgliederliste",
-       'USER_ADMIN_LIMIT_USER' => "Anzahl Mitglieder pro Seite",
-       'USER_ADMIN_ALPHA_USER' => "Azanhl Buchstaben pro Zeile",
-       'USER_ACCOUNT_SAVED' => "Mitgliedsaccount gespeichert.",
-       'USER_ACCOUNT_NOT_SAVED' => "Mitgliedsaccount <u>nicht</u> gespeichert.",
-       'USER_ACCOUNT_LOCKED' => "Mitgliedsaccount <span class=\"data\">%s</span> wurde gesperrt.",
-       'USER_ACCOUNT_UNLOCKED' => "Mitgliedsaccount <span class=\"data\">%s</span> wurde freigegeben.",
+       'ADMIN_USER_PAGENAV' => "Seiten",
+       'ADMIN_CONFIG_USER_TITLE' => "Konfiguration - Mitgliederliste",
+       'ADMIN_USER_LIMIT_USER' => "Anzahl Mitglieder pro Seite",
+       'ADMIN_USER_ALPHA_USER' => "Azanhl Buchstaben pro Zeile",
+       'ADMIN_USER_ACCOUNT_SAVED' => "Mitgliedsaccount gespeichert.",
+       'ADMIN_USER_ACCOUNT_NOT_SAVED' => "Mitgliedsaccount <u>nicht</u> gespeichert.",
+       'ADMIN_USER_ACCOUNT_LOCKED' => "Mitgliedsaccount <span class=\"data\">%s</span> wurde gesperrt.",
+       'ADMIN_USER_ACCOUNT_UNLOCKED' => "Mitgliedsaccount <span class=\"data\">%s</span> wurde freigegeben.",
 ));
 
 // [EOF]
index 85dad12..a374d0a 100644 (file)
@@ -51,11 +51,11 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = '
                // Load entries only from a single user
                $add = sprintf(" AND `userid`=%s", bigintval($userid));
                $mode = 'member'; $COLS = 4; $DT_MODE = 2;
-               $message = '{--DOUBLER_MEMBER_NO_ENTRIES_FOUND--}';
+               $message = '{--MEMBER_DOUBLER_NO_ENTRIES_FOUND--}';
        } else {
                // Guest mode!
                $mode = 'guest'; $COLS = 3; $DT_MODE = 3;
-               $message = '{--DOUBLER_GUEST_NO_ENTRIES_FOUND--}';
+               $message = '{--GUEST_DOUBLER_NO_ENTRIES_FOUND--}';
        }
 
        if (($done == 'Y') && ($sort == 'ASC')) {
index d8d4873..f0cc8b3 100644 (file)
@@ -50,7 +50,7 @@ function addOrderSelectionOptions ($default) {
        foreach ($LIST as $item) {
                $selected = '';
                if ($item == $default) $selected = ' selected="selected"';
-               $OUT .= '<option value="' . $item . '"' . $selected . '>{--ORDER_SELECT_COLUMN_' . strtoupper($item) . '--}</option>';
+               $OUT .= '<option value="' . $item . '"' . $selected . '>{--ADMIN_ORDER_SELECT_COLUMN_' . strtoupper($item) . '--}</option>';
        } // END - foreach
 
        // Return the output
index c13b24a..34bec19 100644 (file)
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 //
 function ifRequiredRegisterFieldsAreSet (&$array) {
index 85d8529..1c28159 100644 (file)
@@ -179,7 +179,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 
                        // Load mail template and send mail away...
                        $message = loadEmailTemplate('member_doubler', $content, $content['userid']);
-                       sendEmail($content['userid'], '{--DOUBLER_MEMBER_SUBJECT--}', $message);
+                       sendEmail($content['userid'], '{--MEMBER_DOUBLER_SUBJECT--}', $message);
                } // END - if
        } // END - while
 } // END - if
index ffade8c..30b0a97 100644 (file)
@@ -184,8 +184,8 @@ WHERE
        // Load template
        loadTemplate('admin_config_point_settings', false, $content);
 } elseif (getRequestParameter('sub') == 'ref') {
-       // 12          3     32    2                         3     32    2                        3321
-       if ((isFormSent('del')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
+       // 12          3     32    2                        3321
+       if ((isFormSent('del')) && (ifPostContainsSelections())) {
                // Delete entries
                $OUT = '';
                foreach (postRequestParameter('sel') as $id => $value) {
@@ -200,7 +200,7 @@ WHERE
 
                // Load main template
                loadTemplate('admin_del_reflevel', false, $OUT);
-       } elseif ((isFormSent('edit')) && (isPostRequestParameterSet('sel')) && (ifPostContainsSelections())) {
+       } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
                // Edit entries
                $OUT = '';
                foreach (postRequestParameter('sel') as $id => $value) {
index 0d65e88..d852274 100644 (file)
@@ -61,7 +61,7 @@ if (isFormSent()) {
        } // END - foreach
 
        // Output message for updated entries
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('REGISTER_ADMIN_CHANGES_SAVED', $cnt));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_REGISTER_CHANGES_SAVED', $cnt));
 } // END - if
 
 // List all register values
index 3e80809..3425519 100644 (file)
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
index 9952eb9..dadb537 100644 (file)
@@ -111,10 +111,10 @@ LIMIT 1",
                                postRequestParameter('email'),
                                bigintval(getRequestParameter('userid')),
                        ), __FILE__, __LINE__);
-                       $content = '{--USER_ACCOUNT_SAVED--}';
+                       $content = '{--ADMIN_USER_ACCOUNT_SAVED--}';
                } else {
                        // Problem while saving data
-                       $content = '{--USER_ACCOUNT_NOT_SAVED--}';
+                       $content = '{--ADMIN_USER_ACCOUNT_NOT_SAVED--}';
                }
 
                // Load template
index 2bf2bbe..32d6f2a 100644 (file)
@@ -75,7 +75,7 @@ if (isGetRequestParameterSet('userid')) {
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
+                       $message = getMaskedMessage('ADMIN_USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
                        $isActive = true;
                } elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
@@ -110,7 +110,7 @@ LIMIT 1",
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
+                       $message = getMaskedMessage('ADMIN_USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
                        $isActive = true;
                } elseif (isFormSent('del')) {
                        // Delete the account
index 48f1cdf..85a1ac0 100644 (file)
@@ -58,15 +58,15 @@ foreach ($DATA['tables'] as $row_array) {
        if (empty($row_array[1])) $row_array[1] = 'NONE';
 
        // Get repair/optimization status
-       $repairStatus = '{--OPTIMIZE_STATUS_' . str_replace('__', '_', str_replace(',', '', str_replace('+', '', str_replace("'", '', str_replace(' ', '_', strtoupper($row_array[1])))))) . '--}';
-       $optimizeStatus = '{--OPTIMIZE_STATUS_UNSUPPORTED--}';
+       $repairStatus = '{--ADMIN_OPTIMIZE_STATUS_' . str_replace('__', '_', str_replace(',', '', str_replace('+', '', str_replace("'", '', str_replace(' ', '_', strtoupper($row_array[1])))))) . '--}';
+       $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_UNSUPPORTED--}';
 
        if ($row_array[4] > 0) {
-               $optimizeStatus = '{--OPTIMIZE_STATUS_OPTIMIZED--}';
+               $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_OPTIMIZED--}';
                $B1 = '<strong>'; $B2 = '<strong>';
                $gain_tabs++;
        } elseif (count(explode(' ', $row_array[2])) == 0) {
-               $optimizeStatus = '{--OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
+               $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
        }
 
        // Prepare data for the row template
index 63a8708..ce69ffa 100644 (file)
@@ -1106,7 +1106,10 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
                                // And sent it away
                                sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
-                               if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+                               if (!isGetRequestParameterSet('mid')) {
+                                       // Output message to admin
+                                       loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+                               } // END - if
                        }
 
                        // Maybe there's another ref?
index df15ede..e568da4 100644 (file)
@@ -1843,7 +1843,7 @@ function ifPostContainsSelections ($element = 'sel') {
        // Do we have cache?
        if (!isset($GLOBALS['post_contains_selections'][$element])) {
                // Determine it
-               $GLOBALS['post_contains_selections'][$element] = (countPostSelection($element) > 0);
+               $GLOBALS['post_contains_selections'][$element] = ((isPostRequestParameterSet($element)) && (countPostSelection($element) > 0));
        } // END - if
 
        // Return cache
index d66bdcb..113c7f0 100644 (file)
@@ -2,19 +2,20 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_register%}" method="post">
 <table border="0" cellpadding="0" cellspacing="0" class="admin_table dashed">
        <tr>
-               <td colspan="3" align="center" class="admin_title"><strong>{--REGISTER_MUST_HEADER--}:</strong>
+               <td colspan="3" align="center" class="admin_title">
+                       <strong>{--ADMIN_CONFIG_REGISTER_MUST_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
                <td width="20" class="header_column bottom right" align="center">{--ID_SELECT--}</td>
-               <td width="325" class="header_column bottom right" align="center">{--REGISTER_FIELD_NAME--}:</td>
-               <td width="105" class="header_column bottom" align="center">{--REGISTER_FIELD_REQUIRED--}</td>
+               <td width="325" class="header_column bottom right" align="center">{--ADMIN_REGISTER_FIELD_NAME--}:</td>
+               <td width="105" class="header_column bottom" align="center">{--ADMIN_REGISTER_FIELD_REQUIRED--}</td>
        </tr>
        $content
        <tr>
                <td colspan="3" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" name="ok" value="{--REGISTER_CHANGE_MUST--}" />
+                       <input type="submit" name="ok" value="{--ADMIN_REGISTER_CHANGE_MUST--}" />
                </td>
        </tr>
 </table>
index d4d44b0..55efa10 100644 (file)
@@ -3,21 +3,21 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom right" align="center">
-                       <strong>{--MODULE_NAME--}</strong>
+                       <strong>{--ADMIN_MODULE_NAME--}</strong>
                </td>
                <td class="admin_title bottom right" align="center">
-                       <strong>{--MODULE_TITLE--}</strong>
+                       <strong>{--ADMIN_MODULE_TITLE--}</strong>
                </td>
                <td class="admin_title bottom" align="center">
-                       <strong>{--MODULE_SKIPPED--}</strong>
+                       <strong>{--ADMIN_MODULE_SKIPPED--}</strong>
                </td>
        </tr>
        $content
        <tr>
-               <td colspan="3" class="admin_footer"><input
-                       type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
-               <input type="submit" name="ok" class="admin_submit"
-                       value="{--SAVE_SETTINGS--}" /></td>
+               <td colspan="3" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
+               </td>
        </tr>
 </table>
 </form>
index 3815a6a..4999fed 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom">
-                       <strong>{--ADMIN_TOP10_CONFIG_HEADER--}</strong>
+                       <strong>{--ADMIN_CONFIG_TOP10_TITLE--}</strong>
                </td>
        </tr>
        <tr>
index 9f63954..3f77ea2 100644 (file)
@@ -3,17 +3,17 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom">
-                       <strong>{--USER_ADMIN_CONFIG_HEADER--}</strong>
+                       <strong>{--ADMIN_CONFIG_USER_TITLE--}</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--USER_ADMIN_LIMIT_USER--}:</td>
+               <td align="right">{--ADMIN_USER_LIMIT_USER--}:</td>
                <td>
                        <input type="text" name="user_limit" class="admin_normal" value="{?user_limit?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--USER_ADMIN_ALPHA_USER--}:</td>
+               <td class="bottom" align="right">{--ADMIN_USER_ALPHA_USER--}:</td>
                <td class="bottom">
                        <input type="text" name="user_alpha" class="admin_normal" value="{?user_alpha?}" size="4" maxlength="6" />
                </td>
index 4a9742f..843f510 100644 (file)
@@ -30,5 +30,5 @@ $content[rows]
 </div>
 
 <div class="admin_note">
-       <strong>{--TASK_DELETE_MODE_NOTE--}</strong>
+       <strong>{--ADMIN_TASK_DELETE_MODE_NOTE--}</strong>
 </div>
index ef00578..159565d 100644 (file)
@@ -3,7 +3,7 @@
                <table border="0" cellspacing="0" cellpadding="0">
                <tr>
                        <td class="admin_pagenav">
-                               [{--USER_PAGENAV--}:$content[list]]
+                               [{--ADMIN_USER_PAGENAV--}:$content[list]]
                        </td>
                </tr>
                </table>
index 10c56e8..082091c 100644 (file)
@@ -2,21 +2,21 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <!-- @TODO Shouldn't we add a title here? //-->
        <tr>
-               <td width="120" class="header_column bottom right" align="center"><strong>{--OPTIMIZE_DBNAME--}:</strong></td>
-               <td width="110" class="header_column bottom right" align="center"><strong>{--OPTIMIZE_REPAIRED--}:</strong></td>
-               <td width="110" class="header_column bottom right" align="center"><strong>{--OPTIMIZE_OPTIMIZED--}:</strong></td>
-               <td width="120" class="header_column bottom right" align="center"><strong>{--OPTIMIZE_TOTAL_SIZE--}:</strong></td>
-               <td width="120" class="header_column bottom" align="center"><strong>{--OPTIMIZE_GAIN_SIZE--}:</strong></td>
+               <td width="120" class="header_column bottom right" align="center"><strong>{--ADMIN_OPTIMIZE_DBNAME--}:</strong></td>
+               <td width="110" class="header_column bottom right" align="center"><strong>{--ADMIN_OPTIMIZE_REPAIRED--}:</strong></td>
+               <td width="110" class="header_column bottom right" align="center"><strong>{--ADMIN_OPTIMIZE_OPTIMIZED--}:</strong></td>
+               <td width="120" class="header_column bottom right" align="center"><strong>{--ADMIN_OPTIMIZE_TOTAL_SIZE--}:</strong></td>
+               <td width="120" class="header_column bottom" align="center"><strong>{--ADMIN_OPTIMIZE_GAIN_SIZE--}:</strong></td>
        </tr>
        $content[rows]
        <tr>
                <td colspan="5" class="admin_footer" style="padding-top: 15px; padding-bottom: 15px;">
-                       {--OPTIMIZE_DB_TOTAL_TABLES--}: <strong>$content[total_tabs]</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_SIZE--}: <strong>{%pipe,translateComma=$content[total_size]%} {--KBYTES--}</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: <strong>$content[total_rows]</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_OPTI--}: <strong>{%pipe,translateComma=$content[total_optimized]%} {--KBYTES--}</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: <strong>$content[now_optimized]</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: <strong>{%pipe,translateComma=$content[total_gain]%} {--KBYTES--}</strong>
+                       {--ADMIN_OPTIMIZE_DB_TOTAL_TABLES--}: <strong>$content[total_tabs]</strong><br />
+                       {--ADMIN_OPTIMIZE_DB_TOTAL_SIZE--}: <strong>{%pipe,translateComma=$content[total_size]%} {--KBYTES--}</strong><br />
+                       {--ADMIN_OPTIMIZE_DB_TOTAL_OPTIMIZE--}: <strong>$content[total_rows]</strong><br />
+                       {--ADMIN_OPTIMIZE_DB_TOTAL_OPTI--}: <strong>{%pipe,translateComma=$content[total_optimized]%} {--KBYTES--}</strong><br />
+                       {--ADMIN_OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: <strong>$content[now_optimized]</strong><br />
+                       {--ADMIN_OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: <strong>{%pipe,translateComma=$content[total_gain]%} {--KBYTES--}</strong>
                </td>
        </tr>
 </table>
index 682d308..dabd270 100644 (file)
@@ -1,4 +1,4 @@
 <div>
-       {--DOUBLER_MEMBER_YOUR_REFERAL_LINK--}:
+       {--MEMBER_DOUBLER_YOUR_REFERAL_LINK--}:
        <a href="{%url=doubler.php?refid=$content%}">{%url=doubler.php?refid=$content</a>
 </div>
index 5d4b9a3..3ae5673 100644 (file)
@@ -71,7 +71,7 @@
                        </tr>
                        <tr>
                                <td colspan="2" align="center">
-                                       <div class="guest_failed">$content[must_fillout_marker]&nbsp;:&nbsp;{--REGISTER_MUST_SET_NOTE--}</div>
+                                       <div class="guest_failed">$content[must_fillout_marker]&nbsp;:&nbsp;{--GUEST_REGISTER_MUST_SET_NOTE--}</div>
                                </td>
                        </tr>
                </table>
index ecb9632..0e13cd3 100644 (file)
@@ -1,6 +1,6 @@
 <div align="center">
        <div class="para">
-       {--DOUBLER_MEMBER_YOUR_LINK--}:
+       {--MEMBER_DOUBLER_YOUR_LINK--}:
        </div>
 
        <div>
                <strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die <strong>{%config,translateComma=doubler_ref%}%</strong> Referal-Verg&uuml;tung zu erhalten!
        </div>
 
-       <div class="big">{--DOUBLER_MEMBER_ALREADY_PAYOUT--}:</div>
+       <div class="big">{--MEMBER_DOUBLER_ALREADY_PAYOUT--}:</div>
        $content[payout_history]
 
-       <div class="big">{--DOUBLER_MEMBER_NEXT_PAYOUT--}:</div>
+       <div class="big">{--MEMBER_DOUBLER_NEXT_PAYOUT--}:</div>
        {%pipe,getMemberId,generateDoublerTable%}
 
-       <div class="big">{--DOUBLER_MEMBER_REFERAL_PAYOUT--}:</div>
+       <div class="big">{--MEMBER_DOUBLER_REFERAL_PAYOUT--}:</div>
        $content[payout_ref]
 </div>