Naming convention applied, more cleanups, more EL
authorRoland Häder <roland@mxchange.org>
Tue, 20 Jul 2010 21:06:18 +0000 (21:06 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 20 Jul 2010 21:06:18 +0000 (21:06 +0000)
26 files changed:
DOCS/TODOs.txt
inc/language/de.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-config_bonus.php
inc/modules/admin/what-config_doubler.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/member/what-order.php
templates/de/html/admin/admin_add_cat.tpl
templates/de/html/admin/admin_add_guest_menu.tpl
templates/de/html/admin/admin_add_member_menu.tpl
templates/de/html/admin/admin_add_payment.tpl
templates/de/html/admin/admin_add_points.tpl
templates/de/html/admin/admin_add_points_all.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_cats.tpl
templates/de/html/admin/admin_edit_cats_row.tpl
templates/de/html/admin/admin_list_chk_reg.tpl
templates/de/html/admin/admin_list_chk_reg_row.tpl
templates/de/html/admin/admin_list_payments.tpl
templates/de/html/admin/admin_list_unconfirmed.tpl
templates/de/html/admin/admin_sub_points.tpl
templates/de/html/admin/admin_sub_points_all.tpl
templates/de/html/admin/admin_unlock_emails.tpl
templates/de/html/admin/admin_update_download.tpl
templates/de/html/member/member_cats_header.tpl
templates/de/html/member/member_points.tpl

index 41661cf..e2b1105 100644 (file)
 ./inc/functions.php:2248:      // @TODO This is still very static, rewrite it somehow
 ./inc/gen_sql_patches.php:96:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:63:        // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1129:// @TODO Rewrite these two constants
-./inc/language/de.php:1144:// @TODO Rewrite these three constants
+./inc/language/de.php:1126:// @TODO Rewrite these two constants
+./inc/language/de.php:1141:// @TODO Rewrite these three constants
 ./inc/language/de.php:301:     // @TODO Following two are unused?
-./inc/language/de.php:822:// @TODO Are these constants longer used?
+./inc/language/de.php:820:// @TODO Are these constants longer used?
 ./inc/language-functions.php:234:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:46:// @TODO Rewrite all language constants to this function.
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
 ./inc/language/refback_de.php:46:// @TODO Rewrite these constants to one
 ./inc/language/sponsor_de.php:119:// @TODO Rewrite these four constants to one and use sprintf()
-./inc/libs/admins_functions.php:435:           // @TODO This can be, somehow, rewritten
+./inc/libs/admins_functions.php:432:           // @TODO This can be, somehow, rewritten
 ./inc/libs/beg_functions.php:58:               // @TODO Try to rewrite the following unset()
 ./inc/libs/bonus_functions.php:204:            // @TODO Move this HTML to a template
 ./inc/libs/bonus_functions.php:288:            // @TODO This query isn't right, it will only update if the user was for a longer time away!
 ./inc/modules/admin/what-list_links.php:89:                            // @TODO Find a way to rewrite this. See some lines above for different queries
 ./inc/modules/admin/what-list_links.php:98:                                    // @TODO Rewrite this to includes/filter
 ./inc/modules/admin/what-list_refs.php:107:                                                            // @TODO Try to rewrite some to EL
-./inc/modules/admin/what-list_unconfirmed.php:100:             // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
-./inc/modules/admin/what-list_unconfirmed.php:77:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
-./inc/modules/admin/what-list_unconfirmed.php:88:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
+./inc/modules/admin/what-list_unconfirmed.php:79:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
+./inc/modules/admin/what-list_unconfirmed.php:98:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_user.php:151:            // @TODO Rewrite these to filters
 ./inc/modules/admin/what-list_user.php:257:            // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:300:                    // @TODO Rewrite this into a filter
 ./inc/modules/member/what-beg.php:65:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 ./inc/modules/member/what-bonus.php:57:        // @TODO Rewrite this to a filter
 ./inc/modules/member/what-categories.php:132:          // @TODO Rewrite this to use $OUT .= ...
-./inc/modules/member/what-order.php:427:                       // @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:428:                       // @TODO Rewrite this to a filter
 ./inc/modules/member/what-payout.php:196:                                      // @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter?
 ./inc/modules/member/what-rallyes.php:91:      // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
index 7cacca0..1b3fbe6 100644 (file)
@@ -148,12 +148,12 @@ addMessages(array(
        'ADMIN_EDIT_WHAT' => "Unteraktionswert &auml;ndern",
        'ADMIN_EDIT_TITLE' => "Linktitel &auml;ndern",
        'ADMIN_ADD_MENU' => "Men&uuml; hinzuf&uuml;gen",
-       'ENTER_TITLE' => "Geben Sie den Linktitel zum neuen Men&uuml;punkt ein",
-       'SELECT_PARENT_MENU' => "W&auml;hlen Sie das &uuml;bergeordnete Hauptmen&uuml; aus",
+       'ADMIN_ENTER_TITLE' => "Geben Sie den Linktitel zum neuen Men&uuml;punkt ein",
+       'ADMIN_SELECT_PARENT_MENU' => "W&auml;hlen Sie das &uuml;bergeordnete Hauptmen&uuml; aus",
        'IS_TOP_MENU' => "Ist ein Hauptmen&uuml;",
-       'SELECT_WHAT_NAME' => "W&auml;hlen Sie den passenden Suffix aus der Liste aus",
+       'ADMIN_SELECT_WHAT_NAME' => "W&auml;hlen Sie den passenden Suffix aus der Liste aus",
        'ENTER_DESCR' => "Geben Sie eine kurze aussagekr&auml;ftige Beschreibung des Men&uuml;punktes ein",
-       'SELECT_BELOW_MENU' => "W&auml;hlen Sie den Men&uuml;punkt aus, unterhalb dem der neue Punkt erscheinen soll",
+       'ADMIN_SELECT_BELOW_MENU' => "W&auml;hlen Sie den Men&uuml;punkt aus, unterhalb dem der neue Punkt erscheinen soll",
        'ADMIN_EDIT_DESCRIPTION' => "Beschreibung &auml;ndern",
        'CREATE_WHAT_FIRST' => "Bitte erstellen Sie zuerst die what-xxxxx.php Datei. Dann k&ouml;nnen Sie sie hier ausw&auml;hlen.",
        'MENU_IS_VISIBLE' => "Men&uuml;punkt ist sichtbar",
@@ -177,16 +177,16 @@ addMessages(array(
        'BIRTHDAY' => "Geburtstag (TT.MM.JJJJ)",
        'PASS_1' => "Passwort",
        'PASS_2' => "Passwortbest&auml;tigung",
-       'ADD_NEW_CATEGORY' => "Neue Kategorie hinzuf&uuml;gen",
-       'ENTER_CATNAME' => "Kategoriebezeichnung",
-       'SELECT_PARENT' => "Unter welcher Kategorie soll diese eingeblendet werden?",
+       'ADMIN_ADD_NEW_CATEGORY_TITLE' => "Neue Kategorie hinzuf&uuml;gen",
+       'ADMIN_ENTER_CATEGORY_NAME' => "Kategoriebezeichnung",
+       'ADMIN_SELECT_PARENT_CATEGORY' => "Unter welcher Kategorie soll diese eingeblendet werden?",
        'IS_TOP_CATEGORY' => "Ist oberste Kategorie",
-       'ADD_NEW_CAT' => "Neue Kategorie dazuf&uuml;gen",
-       'CAT_IS_VISIBLE' => "Kategorie wird eingeblendet?",
+       'ADMIN_ADD_NEW_CATEGORY' => "Neue Kategorie dazuf&uuml;gen",
+       'ADMIN_CATEGORY_IS_VISIBLE' => "Kategorie wird eingeblendet?",
        'CATEGORY_ADDED' => "Kategorie wurde hinzugef&uuml;gt",
        'CATEGORY_ALREADY_EXISTS' => "Kategorie existiert bereits.",
        'ADMIN_CONFIG_CATEGORIES_TITLE' => "Aufgelistete Kategorien bearbeiten / l&ouml;schen",
-       'CATNAME' => "Kategoriebezeichnung:",
+       'CATEGORY_NAME' => "Kategoriebezeichnung:",
        'ADMIN_EDIT_CATEGORIES' => "Kategorien bearbeiten",
        'ADMIN_DELETE_CATEGORIES' => "Kategorien l&ouml;schen",
        'NO_CATEGORIES_VISIBLE' => "Derzeit sind keine Kategorien anzeigbar.",
@@ -347,24 +347,25 @@ addMessages(array(
        'MEMBER_YOUR_PERSONAL_REFERAL_LINK' => "Ihr pers&ouml;nlicher Ref-Link zum Werben neuer Mitglieder lautet",
        'MEMBER_YOUR_REFCLICKS' => "Klicks auf Ihren Referal-Link",
        'CLICKS' => "Klicks",
-       'NO_REFLEVEL_LEFT' => "Keine Referal-Ebenen mehr verf&uuml;gbar! Bitte melden Sie sich bei uns.",
+       'MEMBER_NO_REFLEVEL_LEFT' => "Keine Referal-Ebenen mehr verf&uuml;gbar! Bitte melden Sie sich bei uns.",
        'ENGINE' => "{?mt_word?}-Engine",
-       'ADD_NEW_PAYMENT' => "Neue Mailverg&uuml;tung hinzuf&uuml;gen",
-       'ENTER_PAY_TIME' => "Wartezeit",
-       'ENTER_PAY_PAYMENT' => "Verg&uuml;tete {?POINTS?}",
-       'ENTER_PAY_PRICE' => "{?POINTS?}-Kosten",
-       'ENTER_PAY_TITLE' => "Mailname",
-       'ADD_PAYMENT' => "Mailverg&uuml;tung hinzuf&uuml;gen",
+       'ADMIN_ADD_NEW_PAYMENT_TITLE' => "Neue Mailverg&uuml;tung hinzuf&uuml;gen",
+       'ADMIN_ENTER_PAYMENT_TIME' => "Wartezeit",
+       'ADMIN_ENTER_PAYMENT_PAYMENT' => "Verg&uuml;tete {?POINTS?}",
+       'ADMIN_ENTER_PAYMENT_PRICE' => "{?POINTS?}-Kosten",
+       'ADMIN_ENTER_PAYMENT_TITLE' => "Mailname",
+       'ADMIN_ADD_PAYMENT' => "Mailverg&uuml;tung hinzuf&uuml;gen",
        'ADMIN_EDIT_DELETE_PAYMENT_TITLE' => "Mailverg&uuml;tung editieren / l&ouml;schen",
-       'PAY_TIME' => "Wartezeit",
-       'PAY_PAYMENT' => "Verg&uuml;tete {?POINTS?}",
-       'PAY_PRICE' => "{?POINTS?}-Kosten",
-       'PAY_TITLE' => "Mailname",
+       'ADMIN_PAYMENT_ID' => "Mailverg&uuml;tungs-Id",
+       'ADMIN_PAYMENT_TIME' => "Wartezeit",
+       'ADMIN_PAYMENT_PAYMENT' => "Verg&uuml;tete {?POINTS?}",
+       'ADMIN_PAYMENT_PRICE' => "{?POINTS?}-Kosten",
+       'ADMIN_PAYMENT_TITLE' => "Mailname",
        'ADMIN_EDIT_PAYMENT' => "Editeren",
        'ADMIN_DELETE_PAYMENT' => "L&ouml;schen",
        'ENTER_URL' => "Banner-URL",
        'ENTER_ALTERNATE' => "Alternativen Text",
-       'SELECT_VISIBLE' => "Ist der Banner aktiv?",
+       'ADMIN_SELECT_VISIBLE' => "Ist der Banner aktiv?",
        'ADMIN_ADD_REFERAL_BANNER_SUBMIT' => "Werbeanner hinzuf&uuml;gen",
        'ADMIN_EDIT_DELETE_REFERAL_BANNER_TITLE' => "Werbebanner editieren / l&ouml;schen",
        'VIEWS' => "Views",
@@ -453,9 +454,8 @@ addMessages(array(
        'ADMIN_EDIT_EMAIL_SUBJECT' => "Betreff bearbeiten",
        'ADMIN_EDIT_EMAIL_TEXT' => "Werbetext bearbeiten",
        'ADMIN_UNLOCK_EMAILS' => "Neue Mailbuchungen freischalten",
-       'EMAIL_ACCEPT' => "Annehmen",
-       'EMAIL_REJECT' => "Ablehnen und umleiten",
-       'CANNOT_RE_REGISTER_SESS' => "Kann Sitzungs-Cookies nicht doppelt registrieren oder es liegt ein Script-Fehler vor.",
+       'ADMIN_EMAIL_ACCEPT' => "Annehmen",
+       'ADMIN_EMAIL_REJECT' => "Ablehnen und umleiten",
        'ADMIN_MAILS_ACTIVATED' => "Die Mailbuchungen wurden in den Sende-Pool &uuml;bertragen und werden bald versand.",
        'ADMIN_REJECTED_URLS' => "URLs ausw&auml;hlen, die in die Black-List aufgenommen werden sollen:",
        'ADMIN_LOCK_URLS' => "URLs in die Black-List aufnehmen",
@@ -540,8 +540,8 @@ addMessages(array(
        'POOL_ACTIVE' => "Wird gerade versendet",
        'ALL_MEMBERS' => "Alle Mitglieder",
        'ADMIN_SELECT_USER' => "Mitglied ausw&auml;hlen",
-       'ENTER_POINTS_ADD' => "{?POINTS?} zum Aufbuchen",
-       'ENTER_ADD_REASON' => "Grund der Aufbuchung",
+       'ADMIN_ENTER_POINTS_ADD' => "{?POINTS?} zum Aufbuchen",
+       'ADMIN_ENTER_ADD_REASON' => "Grund der Aufbuchung",
        'ADMIN_ADD_SUBJECT' => "{?POINTS?}-Gutschrift durch unsere Admins.",
        'ADMIN_POINTS_ADDED' => "{?POINTS?} wurden gutgeschrieben. Das Mitglied hat eine Mail erhalten.",
        'MEMBER_MAILS_PER_DAY' => "Mitglieder-Mails / Tag",
@@ -573,7 +573,7 @@ addMessages(array(
        'ADMIN_CATEGORY_ID' => "Kategorie-Id",
        'ADMIN_CATEGORY_DESCRIPTION' => "Kategoriebeschreibung",
        'ADMIN_CHANGE_CATEGORIES' => "Kategorien &auml;ndern",
-       'SORT_KEY' => "Sortierung",
+       'ADMIN_ENTER_SORT_KEY' => "Sortierung",
        'ADMIN_CATEGORIES_SAVED' => "Kategorien gespeichert...",
        'ADMIN_CATEGORIES_DELETED' => "Kategorien gel&ouml;scht...",
        'ADMIN_DELETE_CATEGORIES_TITLE' => "Kategorien l&ouml;schen",
@@ -596,18 +596,17 @@ addMessages(array(
        'ADMIN_REFERAL_DEPTHS_SAVED' => "Referal-Ebenen gespeichert...",
        'ADMIN_REFERAL_DEPTHS_DELETED' => "Referal-Ebenen gel&ouml;scht...",
        'ADMIN_EDIT_PAYMENT_TITLE' => "Mailverg&uuml;tungen editieren",
-       'PAYMENT_ID' => "Mailverg&uuml;tungs-Id",
        'ADMIN_CHANGE_PAYMENT' => "Mailverg&uuml;tungen &auml;ndern",
        'ADMIN_REMOVE_PAYMENT' => "Mailverg&uuml;tungen l&ouml;schen",
        'REFERALS' => "Referals",
        'POINTS_SUM' => "Gesamtsumme",
-       'NEW_VERSION_AVAILABLE' => "Neue Version verf&uuml;gbar.",
-       'YOUR_VERSION_IS' => "Installierte Version",
-       'ONLINE_VERSION_IS' => "Verf&uuml;gbare Version",
-       'UPDATE_CREATE_TIME' => "Update wurde erstellt",
-       'DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.",
-       'NO_UPDATES_AVAILABLE' => "Keine neuen Updates verf&uuml;gbar.",
-       'NEW_PATCHES_AVAILABLE' => "Neue Entwickler-Patches verf&uuml;gbar.",
+       'ADMIN_NEW_VERSION_AVAILABLE' => "Neue Version verf&uuml;gbar.",
+       'ADMIN_YOUR_VERSION_IS' => "Installierte Version",
+       'ADMIN_ONLINE_VERSION_IS' => "Verf&uuml;gbare Version",
+       'ADMIN_UPDATE_CREATE_TIME' => "Update wurde erstellt",
+       'ADMIN_DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.",
+       'ADMIN_NO_UPDATES_AVAILABLE' => "Keine neuen Updates verf&uuml;gbar.",
+       'ADMIN_NEW_PATCHES_AVAILABLE' => "Neue Entwickler-Patches verf&uuml;gbar.",
        'KBYTES' => "KBytes",
        'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}",
        'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.",
@@ -809,7 +808,6 @@ addMessages(array(
        'HOME_BOTTOM_NOTE' => "Es werden nur aktive Men&uuml;punkte aus dem Gasthauptmen&uuml; (main) angezeigt.",
        'ADMIN_EDIT' => "&Auml;ndern",
        'ADMIN_EDIT_EXTENSIONS' => "&Auml;ndern von Erweiterungen",
-       'POOL_DELETED' => "Bereinigt",
        'ONLINE_TIMEOUT_IS' => "Die Liste zeigt die Besucher der letzten <span class=\"data\">{%config,createFancyTime=online_timeout%}</span> an.",
        'ADMIN_CONFIG_EXTENSIONS_SETTINGS' => "Erweiterungs-Management konfigurieren",
        'ADMIN_VERBOSE_SQL' => "SQL-Anweisungen beim Registrieren/Updates/Entfernen ausgeben",
@@ -849,7 +847,7 @@ addMessages(array(
        'ADMIN_CONFIG_INDEX_COOKIE' => "Wie lange soll der Besucher die Eingangsseite nicht mehr sehen?",
        'BONUS_EXTENSION_UPGRADE' => "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <span class=\"data\">v0.2.2</span> oder neuer.",
        '_ON' => "an",
-       'CLICK_STATISTICS' => "Mail-Statistik",
+       'MEMBER_CLICK_STATISTICS' => "Mail-Statistik",
        'ADMIN_SELECT_DEF_REFID' => "Standart Referal-Id bei Anmeldung &uuml;ber <strong>keinen</strong> Ref-Link",
        'ADMIN_SELECT_REFID_TARGRT' => "Ziel-Seite des Referal-Linkes",
        'ADMIN_REFERAL_TARGET_REGISTER' => "Zur Anmeldeseite",
@@ -885,8 +883,8 @@ addMessages(array(
        'ADMIN_CONFIG_TITLE_MIDDLE' => "Mittleres Trennzeichen",
        'ADMIN_CONFIG_TITLE_RIGHT' => "Rechte Seite",
        'ADMIN_MENU_PROBLEM_TITLE' => "Problem im Admin-Men&uuml;system erkannt",
-       'CONFIRM_ACCOUNT' => "Account best&auml;tigen",
-       'CONFIRMATION_LINK' => "Hier best&auml;tigen",
+       'ADMIN_CONFIRM_ACCOUNT' => "Account best&auml;tigen",
+       'ADMIN_CONFIRMATION_LINK' => "Hier best&auml;tigen",
        'CLICK_NOW' => "Hier best&auml;tigen",
        'MAILID_LINK' => "Best.-Link",
        'UNKNOWN_MAILID_CODE' => "Unbekannter Fehler-Code <span class=\"data\">%s</span> erkannt.",
@@ -909,14 +907,13 @@ addMessages(array(
        'ADMIN_POINTS_SUBTRACTED' => "{?POINTS?} wurden erfolgreich abgezogen.",
        'ADMIN_ALL_POINTS_SUBTRACTED' => "Allen Mitgliedern wurden {?POINTS?} abgezogen.",
        'ADMIN_SUB_POINTS_FROM_USER' => "Abzug von {?POINTS?} eines Mitgliedes",
-       'ENTER_POINTS_SUB' => "Abzuziehende {?POINTS?}",
-       'ENTER_SUB_REASON' => "Grund des Abzuges",
+       'ADMIN_ENTER_POINTS_SUB' => "Abzuziehende {?POINTS?}",
+       'ADMIN_ENTER_SUB_REASON' => "Grund des Abzuges",
        'ADMIN_SUB_POINTS' => "{?POINTS?} abziehen",
        'ADMIN_SUB_POINTS_FROM_ALL' => "Allen Mitgliedern {?POINTS?} abziehen",
-       'PATCH_DESCRIPTION' => "Beschreibung zum Patch",
-       'DOWNLOAD_SVN' => "SVN-Version herunterladen",
-       'SVN_REPOSITORY' => "SVN-Repository",
-       'DOWNLOAD_NOW' => "Jetzt downloaden.",
+       'ADMIN_DOWNLOAD_SVN' => "SVN-Version herunterladen",
+       'ADMIN_SVN_REPOSITORY' => "SVN-Repository",
+       'ADMIN_DOWNLOAD_NOW' => "Jetzt downloaden.",
        'ADMIN_MEMBER_STATS_TITLE' => "Einstellungen an der Mitglieder-Statistik",
        'ADMIN_MEMBER_STATS_LIMIT' => "Anzahl Mailbuchungen pro Seite (<strong>Nicht verwendet!</strong>)",
        'MEMBER_NO_THEMES_FOUND' => "Keine Design gefunden.",
@@ -924,7 +921,7 @@ addMessages(array(
        'MEMBER_SAVE_THEME' => "Design speichern",
        'MEMBER_THEME_LIST_USAGE' => "W&auml;hlen Sie unten ein neues Design aus und klicken Sie auf <strong>Theme abspeichern</strong>, das Design wird dann nur f&uuml;r Sie dauerhaft ge&auml;ndert.",
        'MEMBER_THEME_SAVED' => "Design gespeichert.",
-       'TASK_NO_TITLE' => "Aufgabe ohne SQL-Anweisungen",
+       'ADMIN_TASK_NO_SQL_TITLE' => "Aufgabe ohne SQL-Anweisungen",
        'MEMBER_UNCONFIRMED_LOCKED' => "Anzahl zu best. Mails f&uuml;r Willkommensgutschrift",
        'MEMBER_CONFIRMED_MAILS' => "Bereits best. Mails",
        '_YEARS'   => "Jahre",
index 90bb61a..e6019df 100644 (file)
@@ -192,7 +192,7 @@ LIMIT 1",
 
                                // Initialize variables (no title for SQL commands by default)
                                $ext_name = ''; $ext_ver = '';
-                               $title = '{--TASK_NO_TITLE--}';
+                               $title = '{--ADMIN_TASK_NO_SQL_TITLE--}';
 
                                // Shall I list SQL commands assigned to an extension installation or update task?
                                if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) {
@@ -245,7 +245,7 @@ LIMIT 1",
                                        // Add SQLs to a table
                                        if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
                                                // Add verbose SQL table
-                                               $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . "<br />\n";
+                                               $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . '<br />';
                                        } // END - if
                                } elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
                                        // Run SQL commands in dry mode but only return the notes
index b9af8ea..e9ee266 100644 (file)
@@ -74,14 +74,6 @@ if (isFormSent()) {
        setConfigEntry('bonus_enable_notify' , postRequestParameter('bonus_enable_notify'));
        setConfigEntry('bonus_disable_notify', postRequestParameter('bonus_disable_notify'));
 } else {
-       // Prepare contants for the template
-       $content['login']  = translateComma(getConfig('login_bonus')        , false);
-       $content['turbo']  = translateComma(getConfig('turbo_bonus')        , false);
-       $content['order']  = translateComma(getConfig('bonus_order')        , false);
-       $content['ref']    = translateComma(getConfig('bonus_ref')          , false);
-       $content['stats']  = translateComma(getConfig('bonus_stats')        , false);
-       $content['notify'] = translateComma(getConfig('bonus_notify_points'), false);
-
        // Transfer options to template
        $content['member_selection'] = addMemberSelectionBox(getBonusUserId(), false, true, true, 'bonus_userid');
 
index 1b3365b..8c816b2 100644 (file)
@@ -78,7 +78,27 @@ if (isFormSent()) {
 
        // Number of rows to display (option lines!!!)
        foreach (array('new','pay','old') as $entry) {
-               $content['display_' . $entry] = generateOptionList('/ARRAY/', array(5,10,20,30,40,50,100), array(5,10,20,30,40,50,100), getConfig('doubler_display_' . $entry));
+               $content['display_' . $entry] = generateOptionList(
+                       '/ARRAY/',
+                       array(
+                               5,
+                               10,
+                               20,
+                               30,
+                               40,
+                               50,
+                               100
+                       ), array(
+                               5,
+                               10,
+                               20,
+                               30,
+                               40,
+                               50,
+                               100
+                       ),
+                       getConfig('doubler_display_' . $entry)
+               );
        } // END - foreach
 
        // Timeout selection box or input box?
index 4fbcbbe..f4cc43f 100644 (file)
@@ -56,8 +56,8 @@ $listed = false;
 // List confirmation links from normal or bonus mails
 if (isGetRequestParameterSet('mid')) {
        // SQL query for mail data
-       $sql = "SELECT
-       s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec
+       $sql = sprintf("SELECT
+       s.`id`, p.`sender`, p.`subject`, p.`text`, p.`url`, p.`timestamp`, s.`max_rec`
 FROM
        `{?_MYSQL_PREFIX?}_pool` AS p
 LEFT JOIN
@@ -65,8 +65,10 @@ LEFT JOIN
 ON
        p.id=s.pool_id
 WHERE
-       p.id='".getRequestParameter('mid')."'
-LIMIT 1";
+       p.`id`=%s
+LIMIT 1",
+               array(bigintval(getRequestParameter('mid')))
+       );
 
        // Column, type and id for member's mail
        $col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
@@ -77,7 +79,15 @@ LIMIT 1";
        // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
-       $sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestParameter('bid')."' LIMIT 1";
+       $sql = sprintf("SELECT
+       `id`, `id` AS `sender`, `subject`, `text`, `url`, `timestamp`, `mails_sent` AS `max_rec`
+FROM
+       `{?_MYSQL_PREFIX?}_bonus`
+WHERE
+       `id`=%s
+LIMIT 1",
+               array(bigintval(getRequestParameter('bid')))
+       );
 
        // Column, type and id for member's mail
        $col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
@@ -97,33 +107,32 @@ if ($listed === true) {
        // Do we have an entry?
        if (SQL_NUMROWS($result_master) == 1) {
                // Mail order / bonus mail found!
-               // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
-               list($stats_id, $sender, $subject, $text, $url, $stamp, $max) = SQL_FETCHROW($result_master);
+               $poolData = SQL_FETCHARRAY($result_master);
 
                // Transfer data to constants for the template
-               if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
-               if ($col == 'bonus_id') $sender = '0';
+               if (($poolData['id'] > 0) && ($ID == '-1')) $ID = $poolData['id'];
+               if ($col == 'bonus_id') $poolData['sender'] = '0';
 
                // Load unconfirmed mail links. Hmmm, this select query is pretty cool
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
                $result = SQL_QUERY_ESC("SELECT
-       l.userid, u.status, u.surname, u.family, u.gender, u.email
+       l.`userid`, u.`status`, u.`surname`, u.`family`, u.`gender`, u.`email`
 FROM
-       `{?_MYSQL_PREFIX?}_user_links` AS l
+       `{?_MYSQL_PREFIX?}_user_links` AS `l`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS u
+       `{?_MYSQL_PREFIX?}_user_data` AS `u`
 ON
-       l.userid=u.userid
+       l.`userid`=u.`userid`
 WHERE
-       l.%s='%s'
+       l.`%s`=%s
 ORDER BY
-       l.userid ASC
+       l.`userid` ASC
 LIMIT %s",
                        array(
                                $col,
                                $ID,
-                               bigintval($max)
+                               bigintval($poolData['max_rec'])
                        ),__FILE__, __LINE__);
 
                // Total number of unconfirmed mails
@@ -163,15 +172,9 @@ LIMIT %s",
                }
 
                // Prepare content
-               $content = array(
-                       'sender'      => $sender,
-                       'subject'     => $subject,
-                       'text'        => $text,
-                       'url'         => $url,
-                       'unconfirmed' => $unconfirmed,
-                       'stamp'       => generateDateTime($stamp, 2),
-                       'rows'        => $OUT
-               );
+               $content['unconfirmed'] = $unconfirmed;
+               $content['timestamp']   = generateDateTime($poolData['timestamp'], 2);
+               $content['rows']        = $OUT;
 
                // Load final template
                loadTemplate('admin_list_unconfirmed', false, $content);
index 95b162d..528c6e5 100644 (file)
@@ -203,12 +203,10 @@ WHERE
        d.receive_mails > 0
        ".$add."
 ORDER BY
-       d.%s %s",
+       d.{?order_select?} {?order_mode?}",
                        array(
                                bigintval(postRequestParameter('cat')),
-                               getMemberId(),
-                               getConfig('order_select'),
-                               getConfig('order_mode'),
+                               getMemberId()
                        ), __FILE__, __LINE__);
 
                // Do we enougth receivers left?
@@ -250,7 +248,10 @@ LIMIT 1",
 
                        // Update receiver list
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
-                               array(convertReceivers($receiver), $content['target_send']), __FILE__, __LINE__);
+                               array(
+                                       convertReceivers($receiver),
+                                       $content['target_send']
+                               ), __FILE__, __LINE__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it
                        if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
index a1a9383..a70b2aa 100644 (file)
@@ -3,13 +3,13 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" align="center" colspan="2">
-                       <strong>{--ADD_NEW_CATEGORY--}</strong>
+                       <strong>{--ADMIN_ADD_NEW_CATEGORY_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
                <td align="right">
-                       <strong>{--ENTER_CATNAME--}:</strong>
+                       <strong>{--ADMIN_ENTER_CATEGORY_NAME--}:</strong>
                </td>
                <td>
                        <input type="text" class="admin_normal" name="catname" size="30" maxlength="255" />
@@ -18,7 +18,7 @@
 
        <tr>
                <td align="right">
-                       <strong>{--SELECT_PARENT--}</strong>
+                       <strong>{--ADMIN_SELECT_PARENT_CATEGORY--}</strong>
                </td>
                <td>
                        <select name="parent" size="1" class="admin_select">
@@ -30,7 +30,7 @@
 
        <tr>
                <td class="bottom" align="right">
-                       <strong>{--CAT_IS_VISIBLE--}</strong>
+                       <strong>{--ADMIN_CATEGORY_IS_VISIBLE--}</strong>
                </td>
                <td class="bottom">
                        <input type="radio" class="admin_normal" name="visible" value="Y" checked="checked" /> {--YES--}<br />
@@ -41,7 +41,7 @@
        <tr>
                <td class="admin_footer" colspan="2">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="add" class="admin_submit" value="{--ADD_NEW_CAT--}" />
+                       <input type="submit" name="add" class="admin_submit" value="{--ADMIN_ADD_NEW_CATEGORY--}" />
                </td>
        </tr>
 </table>
index 140519a..aaebdb1 100644 (file)
@@ -2,27 +2,27 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=guest_add%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
-               <td align="right" width="245">{--ENTER_TITLE--}:</td>
+               <td align="right" width="245">{--ADMIN_ENTER_TITLE--}:</td>
                <td align="center" width="245">
                        <input type="text" name="title" class="admin_normal" size="30" maxlength="50" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_WHAT_NAME--}:</td>
+               <td align="right">{--ADMIN_SELECT_WHAT_NAME--}:</td>
                <td align="center">
                        $content[what_selection]<br />
                        <span class="admin_note">({--CREATE_WHAT_FIRST--})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_PARENT_MENU--}:</td>
+               <td align="right">{--ADMIN_SELECT_PARENT_MENU--}:</td>
                <td align="center">
                        $content[action_selection]<br />
                        <span class="admin_note">({--CREATE_ACTION_FIRST--})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_BELOW_MENU--}:</td>
+               <td align="right">{--ADMIN_SELECT_BELOW_MENU--}:</td>
                <td align="center">$content[below_selection]</td>
        </tr>
        <tr>
index c4ea81c..2036905 100644 (file)
@@ -2,27 +2,27 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=mem_add%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
-               <td align="right" width="245">{--ENTER_TITLE--}:</td>
+               <td align="right" width="245">{--ADMIN_ENTER_TITLE--}:</td>
                <td align="center" width="245">
                        <input type="text" name="title" class="admin_normal" size="30" maxlength="50" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_WHAT_NAME--}:</td>
+               <td align="right">{--ADMIN_SELECT_WHAT_NAME--}:</td>
                <td align="center">
                        $content[what_selection]<br />
                        <span class="admin_note">({--CREATE_WHAT_FIRST--})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_PARENT_MENU--}:</td>
+               <td align="right">{--ADMIN_SELECT_PARENT_MENU--}:</td>
                <td align="center">
                        $content[action_selection]<br />
                        <span class="admin_note">({--CREATE_ACTION_FIRST--})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_BELOW_MENU--}:</td>
+               <td align="right">{--ADMIN_SELECT_BELOW_MENU--}:</td>
                <td align="center">$content[below_selection]</td>
        </tr>
        <tr>
index b9747d7..a798a87 100644 (file)
@@ -3,31 +3,31 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="410">
        <tr>
                <td class="admin_title bottom" colspan="2">
-                       <strong>{--ADD_NEW_PAYMENT--}</strong>
+                       <strong>{--ADMIN_ADD_NEW_PAYMENT_TITLE--}</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_PAY_TIME--}:</td>
+               <td align="right">{--ADMIN_ENTER_PAYMENT_TIME--}:</td>
                <td>
                        <input type="text" name="t_wait" class="admin_normal" size="3" maxlength="3" /> {--_SECONDS--}
                </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_PAY_PAYMENT--}:</td>
+               <td align="right">{--ADMIN_ENTER_PAYMENT_PAYMENT--}:</td>
                <td>
                        <input type="text" name="payment" class="admin_normal" size="3" maxlength="3" />
                        <span class="tiny">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_PAY_PRICE--}:</td>
+               <td align="right">{--ADMIN_ENTER_PAYMENT_PRICE--}:</td>
                <td>
                        <input type="text" name="price" class="admin_normal" size="3" maxlength="3" />
                        <span class="tiny">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ENTER_PAY_TITLE--}:</td>
+               <td class="bottom" align="right">{--ADMIN_ENTER_PAYMENT_TITLE--}:</td>
                <td class="bottom">
                        <input type="text" name="title" class="admin_normal" size="15" maxlength="255" />
                </td>
@@ -35,9 +35,9 @@
        <tr>
                <td class="admin_footer" colspan="2">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="ok" class="admin_submit" value="{--ADD_PAYMENT--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--ADMIN_ADD_PAYMENT--}" />
                </td>
        </tr>
 </table>
 </form>
-</div>
\ No newline at end of file
+</div>
index 0957541..3cf7609 100644 (file)
@@ -8,13 +8,13 @@
                </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_POINTS_ADD--}:</td>
+               <td align="right">{--ADMIN_ENTER_POINTS_ADD--}:</td>
                <td>
                        <input type="text" class="admin_normal" name="points" size="6" maxlength="7" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ENTER_ADD_REASON--}:</td>
+               <td class="bottom" align="right">{--ADMIN_ENTER_ADD_REASON--}:</td>
                <td class="bottom">
                        <textarea name="reason" class="admin_normal" rows="5" cols="20"></textarea>
                </td>
index e90bd8b..6c097dc 100644 (file)
@@ -5,13 +5,13 @@
                <td class="admin_title" colspan="2" align="center">{--ADMIN_ADD_POINTS_TO_ALL--}:</td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_POINTS_ADD--}:</td>
+               <td align="right">{--ADMIN_ENTER_POINTS_ADD--}:</td>
                <td>
                        <input type="text" name="points" size="6" maxlength="7" class="admin_normal" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_ADD_REASON--}:</td>
+               <td align="right">{--ADMIN_ENTER_ADD_REASON--}:</td>
                <td>
                        <textarea name="reason" class="admin_normal" rows="5" cols="20"></textarea>
                </td>
index 20747c0..25ba187 100644 (file)
@@ -79,7 +79,7 @@
                        {--ADMIN_BONUS_ORDER_BONUS--}:
                </td>
                <td align="center">
-                       <input type="text" name="bonus_order" class="admin_normal" size="8" maxlength="20" value="$content[order]" />
+                       <input type="text" name="bonus_order" class="admin_normal" size="8" maxlength="20" value="{%config,translateComma=bonus_order%}" />
                        <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
@@ -88,7 +88,7 @@
                        {--ADMIN_BONUS_REFERAL_BONUS--}:
                </td>
                <td align="center">
-                       <input type="text" name="bonus_ref" class="admin_normal" size="8" maxlength="20" value="$content[ref]" />
+                       <input type="text" name="bonus_ref" class="admin_normal" size="8" maxlength="20" value="{%config,translateComma=bonus_ref%}" />
                        <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
@@ -97,7 +97,7 @@
                        {--ADMIN_BONUS_STATS_BONUS--}:
                </td>
                <td align="center">
-                       <input type="text" name="bonus_stats" class="admin_normal" size="8" maxlength="20" value="$content[stats]" />
+                       <input type="text" name="bonus_stats" class="admin_normal" size="8" maxlength="20" value="{%config,translateComma=bonus_stats%}" />
                        <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
                        {--ADMIN_BONUS_LOGIN_BONUS--}:
                </td>
                <td class="bottom" align="center">
-                       <input type="text" name="login_bonus" class="admin_normal" size="8" maxlength="20" value="$content[login]" />
+                       <input type="text" name="login_bonus" class="admin_normal" size="8" maxlength="20" value="{%config,translateComma=login_bonus%}" />
                        <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
                <td align="right">{--ADMIN_BONUS_TURBO_BONUS--}:</td>
                <td align="center">
-                       <input type="text" name="turbo_bonus" class="admin_normal" size="10" maxlength="20" value="$content[turbo]" />
+                       <input type="text" name="turbo_bonus" class="admin_normal" size="10" maxlength="20" value="{%config,translateComma=turbo_bonus%}" />
                        <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
                        {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--}
                </td>
                <td align="center">
-                       <input type="text" name="bonus_notify_points" class="admin_normal" size="8" maxlength="20" value="$content[notify]" />
+                       <input type="text" name="bonus_notify_points" class="admin_normal" size="8" maxlength="20" value="{%config,translateComma=bonus_notify_points%}" />
                        <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
index a040d97..6671451 100644 (file)
@@ -8,7 +8,7 @@
        </tr>
        <tr>
                <td class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--CATNAME--}</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--CATEGORY_NAME--}</strong></td>
                <td class="header_column bottom right" align="center"><strong>{--IS_VISIBLE--}</strong></td>
                <td class="header_column bottom" align="center"><strong>{--SORTING_KEY--}</strong></td>
        </tr>
index 86693f8..54719a5 100644 (file)
        </td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%}" align="right">{--CAT_IS_VISIBLE--}&nbsp;</td>
+       <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_CATEGORY_IS_VISIBLE--}&nbsp;</td>
        <td class="{%template,ColorSwitch%}">$content[visible_selection]</td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%} bottom" align="right">{--SORT_KEY--}:&nbsp;</td>
+       <td class="{%template,ColorSwitch%} bottom" align="right">{--ADMIN_ENTER_SORT_KEY--}:&nbsp;</td>
        <td class="{%template,ColorSwitch%} bottom">
                <input type="text" name="sort[$content[id]]" class="admin_normal" value="$content[sort]" size="3" maxlength="10" />
        </td>
index 86ed5af..ede6c0e 100644 (file)
@@ -13,7 +13,7 @@
                <td class="header_column right" align="center">{--EMAIL--}</td>
                <td class="header_column right" align="center">{--REMOTE_IP--}</td>
                <td class="header_column right" align="center" width="20">{--REFERAL_UID--}</td>
-               <td class="header_column" align="center">{--CONFIRM_ACCOUNT--}</td>
+               <td class="header_column" align="center">{--ADMIN_CONFIRM_ACCOUNT--}</td>
        </tr>
        $content
 </table>
index 29df9fb..568f720 100644 (file)
@@ -7,6 +7,6 @@
        <td align="center" class="{%template,ColorSwitch%} top right">$content[remote_addr]</td>
        <td align="center" class="{%template,ColorSwitch%} top right">{%pipe,generateUserProfileLink=$content[refid]%}</td>
        <td align="center" class="{%template,ColorSwitch%} top">
-               <a href="{%url=confirm.php?hash=$content[user_hash]%}" target="_blank">{--CONFIRMATION_LINK--}</a>
+               <a href="{%url=confirm.php?hash=$content[user_hash]%}" target="_blank">{--ADMIN_CONFIRMATION_LINK--}</a>
        </td>
 </tr>
index 216a425..cd0edd5 100644 (file)
@@ -8,10 +8,10 @@
        </tr>
        <tr>
                <td class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--PAY_TIME--}:</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--PAY_PAYMENT--}:</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--PAY_PRICE--}:</strong></td>
-               <td class="header_column bottom" align="center"><strong>{--PAY_TITLE--}:</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--ADMIN_PAYMENT_TIME--}:</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--ADMIN_PAYMENT_PAYMENT--}:</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--ADMIN_PAYMENT_PRICE--}:</strong></td>
+               <td class="header_column bottom" align="center"><strong>{--ADMIN_PAYMENT_TITLE--}:</strong></td>
        </tr>
        $content
        <tr>
index 3590924..4871eb2 100644 (file)
@@ -16,7 +16,7 @@
        </td>
        <td align="center" class="bottom">
                {--EMAIL_TIMESTAMP--}:<br />
-               <strong>$content[stamp]</strong>
+               <strong>$content[timestamp]</strong>
        </td>
 </tr>
 <tr>
index 060d79a..2179098 100644 (file)
@@ -8,13 +8,13 @@
                </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_POINTS_SUB--}:</td>
+               <td align="right">{--ADMIN_ENTER_POINTS_SUB--}:</td>
                <td>
                        <input type="text" class="admin_normal" name="points" size="6" maxlength="7" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ENTER_SUB_REASON--}:</td>
+               <td class="bottom" align="right">{--ADMIN_ENTER_SUB_REASON--}:</td>
                <td class="bottom">
                        <textarea name="reason" class="admin_normal" rows="5" cols="20"></textarea>
                </td>
index 6ed7dbb..a26cfdc 100644 (file)
@@ -2,16 +2,20 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=sub_points&amp;userid=all" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
-               <td align="center" class="admin_title bottom" colspan="2">{--ADMIN_SUB_POINTS_FROM_ALL--}:</td>
+               <td align="center" class="admin_title bottom" colspan="2">
+                       {--ADMIN_SUB_POINTS_FROM_ALL--}:
+               </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_POINTS_SUB--}:</td>
+               <td align="right">
+                       {--ADMIN_ENTER_POINTS_SUB--}:
+               </td>
                <td>
                        <input type="text" name="points" size="6" maxlength="7" class="admin_normal" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ENTER_SUB_REASON--}:</td>
+               <td class="bottom" align="right">{--ADMIN_ENTER_SUB_REASON--}:</td>
                <td class="bottom">
                        <textarea name="reason" class="admin_normal" rows="5" cols="20"></textarea>
                </td>
index b9454c2..228806e 100644 (file)
@@ -24,8 +24,8 @@
        <tr>
                <td class="admin_footer top" colspan="8" align="center" height="35">
                        <input type="reset" class="admin_reset" value="{--RESET_SELECT--}" />
-                       <input type="submit" class="admin_submit" name="accept" value="{--EMAIL_ACCEPT--}" />
-                       <input type="submit" class="admin_submit_reject" name="reject" value="{--EMAIL_REJECT--}" />
+                       <input type="submit" class="admin_submit" name="accept" value="{--ADMIN_EMAIL_ACCEPT--}" />
+                       <input type="submit" class="admin_submit_reject" name="reject" value="{--ADMIN_EMAIL_REJECT--}" />
                </td>
        </tr>
 </table>
index 177dfe4..73b7ef9 100644 (file)
@@ -2,32 +2,32 @@
 <div class="admin_table dashed" style="width:580px">
 
 <div class="admin_title bottom">
-       <div class="big">{--NEW_VERSION_AVAILABLE--}</div>
+       <div class="big">{--ADMIN_NEW_VERSION_AVAILABLE--}</div>
 </div>
 
 <div style="clear:both">
-       <div style="float:left;padding:5px">{--YOUR_VERSION_IS--}:</div>
+       <div style="float:left;padding:5px">{--ADMIN_YOUR_VERSION_IS--}:</div>
        <div style="float:right;padding:5px"><strong>v{?FULL_VERSION?} R{?CURR_SVN_REVISION?}</strong></div>
 </div>
 
 <div style="clear:both">
-       <div style="float:left;padding:5px">{--ONLINE_VERSION_IS--}:</div>
+       <div style="float:left;padding:5px">{--ADMIN_ONLINE_VERSION_IS--}:</div>
        <div style="float:right;padding:5px"><strong>v$content[version] R$content[revision]</strong></div>
 </div>
 
 <div style="clear:both">
-       <div style="float:left;padding:5px">{--UPDATE_CREATE_TIME--}:</div>
+       <div style="float:left;padding:5px">{--ADMIN_UPDATE_CREATE_TIME--}:</div>
        <div style="float:right;padding:5px"><strong>$content[changed]</strong></div>
 </div>
 
 <div style="clear:both;height:50px" class="top">
        <div class="admin_title bottom">
-               <div class="big">{--DOWNLOAD_NEW_VERSION--}</div>
+               <div class="big">{--ADMIN_DOWNLOAD_NEW_VERSION--}</div>
        </div>
        <div style="padding:5px">
-               <div style="float:left">{--DOWNLOAD_SVN--}:</div>
+               <div style="float:left">{--ADMIN_DOWNLOAD_SVN--}:</div>
                <div style="float:right">
-                       <strong><a href="{?SERVER_URL?}/cms/index/wht/svn" title="{--SVN_REPOSITORY--}" target="_blank">{--DOWNLOAD_NOW--}</a></strong>
+                       <strong><a href="{?SERVER_URL?}/cms/index/wht/svn" title="{--ADMIN_SVN_REPOSITORY--}" target="_blank">{--ADMIN_DOWNLOAD_NOW--}</a></strong>
                </div>
        </div>
 </div>
index af20590..ddb25fe 100644 (file)
@@ -2,6 +2,6 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=categories%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
 <tr>
-       <td align="center" class="header_column bottom" width="408"><strong>{--CATNAME--}</strong></td>
+       <td align="center" class="header_column bottom" width="408"><strong>{--CATEGORY_NAME--}</strong></td>
        <td align="center" class="header_column bottom" width="180"><strong>{--SELECT_CAT--}</strong></td>
 </tr>
index 8412840..83b064d 100644 (file)
@@ -26,7 +26,7 @@
        $content[special_rows]
        <tr>
                <td colspan="3" class="header_column bottom top">
-                       <div align="center"><strong>{--CLICK_STATISTICS--}</strong></div>
+                       <div align="center"><strong>{--MEMBER_CLICK_STATISTICS--}</strong></div>
                </td>
        </tr>
        <tr>