From: Roland Häder Date: Tue, 20 Jul 2010 21:06:18 +0000 (+0000) Subject: Naming convention applied, more cleanups, more EL X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=896793e2aceee9b4db08bb304ec8fdc5f192ba18 Naming convention applied, more cleanups, more EL --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 41661cfa2a..e2b1105de8 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -49,16 +49,16 @@ ./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! @@ -130,9 +130,8 @@ ./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 @@ -159,7 +158,7 @@ ./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'] = '' . $content['login'] . ''; diff --git a/inc/language/de.php b/inc/language/de.php index 7cacca0e2f..1b3fbe6d26 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -148,12 +148,12 @@ addMessages(array( 'ADMIN_EDIT_WHAT' => "Unteraktionswert ändern", 'ADMIN_EDIT_TITLE' => "Linktitel ändern", 'ADMIN_ADD_MENU' => "Menü hinzufügen", - 'ENTER_TITLE' => "Geben Sie den Linktitel zum neuen Menüpunkt ein", - 'SELECT_PARENT_MENU' => "Wählen Sie das übergeordnete Hauptmenü aus", + 'ADMIN_ENTER_TITLE' => "Geben Sie den Linktitel zum neuen Menüpunkt ein", + 'ADMIN_SELECT_PARENT_MENU' => "Wählen Sie das übergeordnete Hauptmenü aus", 'IS_TOP_MENU' => "Ist ein Hauptmenü", - 'SELECT_WHAT_NAME' => "Wählen Sie den passenden Suffix aus der Liste aus", + 'ADMIN_SELECT_WHAT_NAME' => "Wählen Sie den passenden Suffix aus der Liste aus", 'ENTER_DESCR' => "Geben Sie eine kurze aussagekräftige Beschreibung des Menüpunktes ein", - 'SELECT_BELOW_MENU' => "Wählen Sie den Menüpunkt aus, unterhalb dem der neue Punkt erscheinen soll", + 'ADMIN_SELECT_BELOW_MENU' => "Wählen Sie den Menüpunkt aus, unterhalb dem der neue Punkt erscheinen soll", 'ADMIN_EDIT_DESCRIPTION' => "Beschreibung ändern", 'CREATE_WHAT_FIRST' => "Bitte erstellen Sie zuerst die what-xxxxx.php Datei. Dann können Sie sie hier auswählen.", 'MENU_IS_VISIBLE' => "Menüpunkt ist sichtbar", @@ -177,16 +177,16 @@ addMessages(array( 'BIRTHDAY' => "Geburtstag (TT.MM.JJJJ)", 'PASS_1' => "Passwort", 'PASS_2' => "Passwortbestätigung", - 'ADD_NEW_CATEGORY' => "Neue Kategorie hinzufügen", - 'ENTER_CATNAME' => "Kategoriebezeichnung", - 'SELECT_PARENT' => "Unter welcher Kategorie soll diese eingeblendet werden?", + 'ADMIN_ADD_NEW_CATEGORY_TITLE' => "Neue Kategorie hinzufü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ügen", - 'CAT_IS_VISIBLE' => "Kategorie wird eingeblendet?", + 'ADMIN_ADD_NEW_CATEGORY' => "Neue Kategorie dazufügen", + 'ADMIN_CATEGORY_IS_VISIBLE' => "Kategorie wird eingeblendet?", 'CATEGORY_ADDED' => "Kategorie wurde hinzugefügt", 'CATEGORY_ALREADY_EXISTS' => "Kategorie existiert bereits.", 'ADMIN_CONFIG_CATEGORIES_TITLE' => "Aufgelistete Kategorien bearbeiten / löschen", - 'CATNAME' => "Kategoriebezeichnung:", + 'CATEGORY_NAME' => "Kategoriebezeichnung:", 'ADMIN_EDIT_CATEGORIES' => "Kategorien bearbeiten", 'ADMIN_DELETE_CATEGORIES' => "Kategorien löschen", 'NO_CATEGORIES_VISIBLE' => "Derzeit sind keine Kategorien anzeigbar.", @@ -347,24 +347,25 @@ addMessages(array( 'MEMBER_YOUR_PERSONAL_REFERAL_LINK' => "Ihr persö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ügbar! Bitte melden Sie sich bei uns.", + 'MEMBER_NO_REFLEVEL_LEFT' => "Keine Referal-Ebenen mehr verfügbar! Bitte melden Sie sich bei uns.", 'ENGINE' => "{?mt_word?}-Engine", - 'ADD_NEW_PAYMENT' => "Neue Mailvergütung hinzufügen", - 'ENTER_PAY_TIME' => "Wartezeit", - 'ENTER_PAY_PAYMENT' => "Vergütete {?POINTS?}", - 'ENTER_PAY_PRICE' => "{?POINTS?}-Kosten", - 'ENTER_PAY_TITLE' => "Mailname", - 'ADD_PAYMENT' => "Mailvergütung hinzufügen", + 'ADMIN_ADD_NEW_PAYMENT_TITLE' => "Neue Mailvergütung hinzufügen", + 'ADMIN_ENTER_PAYMENT_TIME' => "Wartezeit", + 'ADMIN_ENTER_PAYMENT_PAYMENT' => "Vergütete {?POINTS?}", + 'ADMIN_ENTER_PAYMENT_PRICE' => "{?POINTS?}-Kosten", + 'ADMIN_ENTER_PAYMENT_TITLE' => "Mailname", + 'ADMIN_ADD_PAYMENT' => "Mailvergütung hinzufügen", 'ADMIN_EDIT_DELETE_PAYMENT_TITLE' => "Mailvergütung editieren / löschen", - 'PAY_TIME' => "Wartezeit", - 'PAY_PAYMENT' => "Vergütete {?POINTS?}", - 'PAY_PRICE' => "{?POINTS?}-Kosten", - 'PAY_TITLE' => "Mailname", + 'ADMIN_PAYMENT_ID' => "Mailvergütungs-Id", + 'ADMIN_PAYMENT_TIME' => "Wartezeit", + 'ADMIN_PAYMENT_PAYMENT' => "Vergütete {?POINTS?}", + 'ADMIN_PAYMENT_PRICE' => "{?POINTS?}-Kosten", + 'ADMIN_PAYMENT_TITLE' => "Mailname", 'ADMIN_EDIT_PAYMENT' => "Editeren", 'ADMIN_DELETE_PAYMENT' => "Lö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ügen", 'ADMIN_EDIT_DELETE_REFERAL_BANNER_TITLE' => "Werbebanner editieren / lö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 übertragen und werden bald versand.", 'ADMIN_REJECTED_URLS' => "URLs auswä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ä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 ändern", - 'SORT_KEY' => "Sortierung", + 'ADMIN_ENTER_SORT_KEY' => "Sortierung", 'ADMIN_CATEGORIES_SAVED' => "Kategorien gespeichert...", 'ADMIN_CATEGORIES_DELETED' => "Kategorien gelöscht...", 'ADMIN_DELETE_CATEGORIES_TITLE' => "Kategorien löschen", @@ -596,18 +596,17 @@ addMessages(array( 'ADMIN_REFERAL_DEPTHS_SAVED' => "Referal-Ebenen gespeichert...", 'ADMIN_REFERAL_DEPTHS_DELETED' => "Referal-Ebenen gelöscht...", 'ADMIN_EDIT_PAYMENT_TITLE' => "Mailvergütungen editieren", - 'PAYMENT_ID' => "Mailvergütungs-Id", 'ADMIN_CHANGE_PAYMENT' => "Mailvergütungen ändern", 'ADMIN_REMOVE_PAYMENT' => "Mailvergütungen löschen", 'REFERALS' => "Referals", 'POINTS_SUM' => "Gesamtsumme", - 'NEW_VERSION_AVAILABLE' => "Neue Version verfügbar.", - 'YOUR_VERSION_IS' => "Installierte Version", - 'ONLINE_VERSION_IS' => "Verfügbare Version", - 'UPDATE_CREATE_TIME' => "Update wurde erstellt", - 'DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.", - 'NO_UPDATES_AVAILABLE' => "Keine neuen Updates verfügbar.", - 'NEW_PATCHES_AVAILABLE' => "Neue Entwickler-Patches verfügbar.", + 'ADMIN_NEW_VERSION_AVAILABLE' => "Neue Version verfügbar.", + 'ADMIN_YOUR_VERSION_IS' => "Installierte Version", + 'ADMIN_ONLINE_VERSION_IS' => "Verfü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ügbar.", + 'ADMIN_NEW_PATCHES_AVAILABLE' => "Neue Entwickler-Patches verfü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üpunkte aus dem Gasthauptmenü (main) angezeigt.", 'ADMIN_EDIT' => "Ändern", 'ADMIN_EDIT_EXTENSIONS' => "Ändern von Erweiterungen", - 'POOL_DELETED' => "Bereinigt", 'ONLINE_TIMEOUT_IS' => "Die Liste zeigt die Besucher der letzten {%config,createFancyTime=online_timeout%} 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 v0.2.2 oder neuer.", '_ON' => "an", - 'CLICK_STATISTICS' => "Mail-Statistik", + 'MEMBER_CLICK_STATISTICS' => "Mail-Statistik", 'ADMIN_SELECT_DEF_REFID' => "Standart Referal-Id bei Anmeldung über keinen 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üsystem erkannt", - 'CONFIRM_ACCOUNT' => "Account bestätigen", - 'CONFIRMATION_LINK' => "Hier bestätigen", + 'ADMIN_CONFIRM_ACCOUNT' => "Account bestätigen", + 'ADMIN_CONFIRMATION_LINK' => "Hier bestätigen", 'CLICK_NOW' => "Hier bestätigen", 'MAILID_LINK' => "Best.-Link", 'UNKNOWN_MAILID_CODE' => "Unbekannter Fehler-Code %s 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 (Nicht verwendet!)", 'MEMBER_NO_THEMES_FOUND' => "Keine Design gefunden.", @@ -924,7 +921,7 @@ addMessages(array( 'MEMBER_SAVE_THEME' => "Design speichern", 'MEMBER_THEME_LIST_USAGE' => "Wählen Sie unten ein neues Design aus und klicken Sie auf Theme abspeichern, das Design wird dann nur für Sie dauerhaft geä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ür Willkommensgutschrift", 'MEMBER_CONFIRMED_MAILS' => "Bereits best. Mails", '_YEARS' => "Jahre", diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 90bb61a898..e6019df0cf 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -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%') . "
\n"; + $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . '
'; } // END - if } elseif ((!empty($ext_name)) && (!empty($ext_ver))) { // Run SQL commands in dry mode but only return the notes diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index b9af8ea74b..e9ee266a6d 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -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'); diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php index 1b3365b7db..8c816b205e 100644 --- a/inc/modules/admin/what-config_doubler.php +++ b/inc/modules/admin/what-config_doubler.php @@ -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? diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 4fbcbbecaf..f4cc43fd95 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -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); diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 95b162d533..528c6e57cd 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -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')); diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index a1a93834f7..a70b2aa105 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -3,13 +3,13 @@
- {--ADD_NEW_CATEGORY--} + {--ADMIN_ADD_NEW_CATEGORY_TITLE--}
- {--ENTER_CATNAME--}: + {--ADMIN_ENTER_CATEGORY_NAME--}: @@ -18,7 +18,7 @@
- {--SELECT_PARENT--} + {--ADMIN_SELECT_PARENT_CATEGORY--}
- {--CAT_IS_VISIBLE--} + {--ADMIN_CATEGORY_IS_VISIBLE--} {--YES--}
@@ -41,7 +41,7 @@
- +
diff --git a/templates/de/html/admin/admin_add_guest_menu.tpl b/templates/de/html/admin/admin_add_guest_menu.tpl index 140519a8d7..aaebdb1c0c 100644 --- a/templates/de/html/admin/admin_add_guest_menu.tpl +++ b/templates/de/html/admin/admin_add_guest_menu.tpl @@ -2,27 +2,27 @@
- + - + - + - + diff --git a/templates/de/html/admin/admin_add_member_menu.tpl b/templates/de/html/admin/admin_add_member_menu.tpl index c4ea81c320..2036905941 100644 --- a/templates/de/html/admin/admin_add_member_menu.tpl +++ b/templates/de/html/admin/admin_add_member_menu.tpl @@ -2,27 +2,27 @@
{--ENTER_TITLE--}:{--ADMIN_ENTER_TITLE--}:
{--SELECT_WHAT_NAME--}:{--ADMIN_SELECT_WHAT_NAME--}: $content[what_selection]
({--CREATE_WHAT_FIRST--})
{--SELECT_PARENT_MENU--}:{--ADMIN_SELECT_PARENT_MENU--}: $content[action_selection]
({--CREATE_ACTION_FIRST--})
{--SELECT_BELOW_MENU--}:{--ADMIN_SELECT_BELOW_MENU--}: $content[below_selection]
- + - + - + - + diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl index b9747d722e..a798a87229 100644 --- a/templates/de/html/admin/admin_add_payment.tpl +++ b/templates/de/html/admin/admin_add_payment.tpl @@ -3,31 +3,31 @@
{--ENTER_TITLE--}:{--ADMIN_ENTER_TITLE--}:
{--SELECT_WHAT_NAME--}:{--ADMIN_SELECT_WHAT_NAME--}: $content[what_selection]
({--CREATE_WHAT_FIRST--})
{--SELECT_PARENT_MENU--}:{--ADMIN_SELECT_PARENT_MENU--}: $content[action_selection]
({--CREATE_ACTION_FIRST--})
{--SELECT_BELOW_MENU--}:{--ADMIN_SELECT_BELOW_MENU--}: $content[below_selection]
- + - + - + - + @@ -35,9 +35,9 @@
- {--ADD_NEW_PAYMENT--} + {--ADMIN_ADD_NEW_PAYMENT_TITLE--}
{--ENTER_PAY_TIME--}:{--ADMIN_ENTER_PAYMENT_TIME--}: {--_SECONDS--}
{--ENTER_PAY_PAYMENT--}:{--ADMIN_ENTER_PAYMENT_PAYMENT--}: ({?POINTS?})
{--ENTER_PAY_PRICE--}:{--ADMIN_ENTER_PAYMENT_PRICE--}: ({?POINTS?})
{--ENTER_PAY_TITLE--}:{--ADMIN_ENTER_PAYMENT_TITLE--}:
- +
- \ No newline at end of file + diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index 09575415c9..3cf7609c92 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -8,13 +8,13 @@ - {--ENTER_POINTS_ADD--}: + {--ADMIN_ENTER_POINTS_ADD--}: - {--ENTER_ADD_REASON--}: + {--ADMIN_ENTER_ADD_REASON--}: diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index e90bd8bf89..6c097dc7c1 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -5,13 +5,13 @@ {--ADMIN_ADD_POINTS_TO_ALL--}: - {--ENTER_POINTS_ADD--}: + {--ADMIN_ENTER_POINTS_ADD--}: - {--ENTER_ADD_REASON--}: + {--ADMIN_ENTER_ADD_REASON--}: diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index 20747c06e7..25ba187569 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -79,7 +79,7 @@ {--ADMIN_BONUS_ORDER_BONUS--}: - + ({?POINTS?}) @@ -88,7 +88,7 @@ {--ADMIN_BONUS_REFERAL_BONUS--}: - + ({?POINTS?}) @@ -97,7 +97,7 @@ {--ADMIN_BONUS_STATS_BONUS--}: - + ({?POINTS?}) @@ -106,7 +106,7 @@ {--ADMIN_BONUS_LOGIN_BONUS--}: - + ({?POINTS?}) @@ -118,7 +118,7 @@ {--ADMIN_BONUS_TURBO_BONUS--}: - + ({?POINTS?}) @@ -210,7 +210,7 @@ {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--} - + ({?POINTS?}) diff --git a/templates/de/html/admin/admin_config_cats.tpl b/templates/de/html/admin/admin_config_cats.tpl index a040d976bb..667145157e 100644 --- a/templates/de/html/admin/admin_config_cats.tpl +++ b/templates/de/html/admin/admin_config_cats.tpl @@ -8,7 +8,7 @@ {--ID_SELECT--} - {--CATNAME--} + {--CATEGORY_NAME--} {--IS_VISIBLE--} {--SORTING_KEY--} diff --git a/templates/de/html/admin/admin_edit_cats_row.tpl b/templates/de/html/admin/admin_edit_cats_row.tpl index 86693f8507..54719a57b3 100644 --- a/templates/de/html/admin/admin_edit_cats_row.tpl +++ b/templates/de/html/admin/admin_edit_cats_row.tpl @@ -10,11 +10,11 @@ - {--CAT_IS_VISIBLE--}  + {--ADMIN_CATEGORY_IS_VISIBLE--}  $content[visible_selection] - {--SORT_KEY--}:  + {--ADMIN_ENTER_SORT_KEY--}:  diff --git a/templates/de/html/admin/admin_list_chk_reg.tpl b/templates/de/html/admin/admin_list_chk_reg.tpl index 86ed5afe83..ede6c0ec6f 100644 --- a/templates/de/html/admin/admin_list_chk_reg.tpl +++ b/templates/de/html/admin/admin_list_chk_reg.tpl @@ -13,7 +13,7 @@ {--EMAIL--} {--REMOTE_IP--} {--REFERAL_UID--} - {--CONFIRM_ACCOUNT--} + {--ADMIN_CONFIRM_ACCOUNT--} $content diff --git a/templates/de/html/admin/admin_list_chk_reg_row.tpl b/templates/de/html/admin/admin_list_chk_reg_row.tpl index 29df9fb494..568f720cec 100644 --- a/templates/de/html/admin/admin_list_chk_reg_row.tpl +++ b/templates/de/html/admin/admin_list_chk_reg_row.tpl @@ -7,6 +7,6 @@ $content[remote_addr] {%pipe,generateUserProfileLink=$content[refid]%} - {--CONFIRMATION_LINK--} + {--ADMIN_CONFIRMATION_LINK--} diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl index 216a425673..cd0edd5020 100644 --- a/templates/de/html/admin/admin_list_payments.tpl +++ b/templates/de/html/admin/admin_list_payments.tpl @@ -8,10 +8,10 @@ {--ID_SELECT--} - {--PAY_TIME--}: - {--PAY_PAYMENT--}: - {--PAY_PRICE--}: - {--PAY_TITLE--}: + {--ADMIN_PAYMENT_TIME--}: + {--ADMIN_PAYMENT_PAYMENT--}: + {--ADMIN_PAYMENT_PRICE--}: + {--ADMIN_PAYMENT_TITLE--}: $content diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl index 3590924e30..4871eb20cc 100644 --- a/templates/de/html/admin/admin_list_unconfirmed.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed.tpl @@ -16,7 +16,7 @@ {--EMAIL_TIMESTAMP--}:
- $content[stamp] + $content[timestamp] diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl index 060d79a2e6..2179098a6e 100644 --- a/templates/de/html/admin/admin_sub_points.tpl +++ b/templates/de/html/admin/admin_sub_points.tpl @@ -8,13 +8,13 @@ - {--ENTER_POINTS_SUB--}: + {--ADMIN_ENTER_POINTS_SUB--}: - {--ENTER_SUB_REASON--}: + {--ADMIN_ENTER_SUB_REASON--}: diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl index 6ed7dbbba9..a26cfdce7d 100644 --- a/templates/de/html/admin/admin_sub_points_all.tpl +++ b/templates/de/html/admin/admin_sub_points_all.tpl @@ -2,16 +2,20 @@
- + - + - + diff --git a/templates/de/html/admin/admin_unlock_emails.tpl b/templates/de/html/admin/admin_unlock_emails.tpl index b9454c2ac1..228806e4b6 100644 --- a/templates/de/html/admin/admin_unlock_emails.tpl +++ b/templates/de/html/admin/admin_unlock_emails.tpl @@ -24,8 +24,8 @@
{--ADMIN_SUB_POINTS_FROM_ALL--}: + {--ADMIN_SUB_POINTS_FROM_ALL--}: +
{--ENTER_POINTS_SUB--}: + {--ADMIN_ENTER_POINTS_SUB--}: +
{--ENTER_SUB_REASON--}:{--ADMIN_ENTER_SUB_REASON--}:
- - + +
diff --git a/templates/de/html/admin/admin_update_download.tpl b/templates/de/html/admin/admin_update_download.tpl index 177dfe4811..73b7ef9cfa 100644 --- a/templates/de/html/admin/admin_update_download.tpl +++ b/templates/de/html/admin/admin_update_download.tpl @@ -2,32 +2,32 @@
-
{--NEW_VERSION_AVAILABLE--}
+
{--ADMIN_NEW_VERSION_AVAILABLE--}
-
{--YOUR_VERSION_IS--}:
+
{--ADMIN_YOUR_VERSION_IS--}:
v{?FULL_VERSION?} R{?CURR_SVN_REVISION?}
-
{--ONLINE_VERSION_IS--}:
+
{--ADMIN_ONLINE_VERSION_IS--}:
v$content[version] R$content[revision]
-
{--UPDATE_CREATE_TIME--}:
+
{--ADMIN_UPDATE_CREATE_TIME--}:
$content[changed]
-
{--DOWNLOAD_NEW_VERSION--}
+
{--ADMIN_DOWNLOAD_NEW_VERSION--}
-
{--DOWNLOAD_SVN--}:
+
{--ADMIN_DOWNLOAD_SVN--}:
diff --git a/templates/de/html/member/member_cats_header.tpl b/templates/de/html/member/member_cats_header.tpl index af20590378..ddb25fe923 100644 --- a/templates/de/html/member/member_cats_header.tpl +++ b/templates/de/html/member/member_cats_header.tpl @@ -2,6 +2,6 @@ - + diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 8412840de1..83b064d4f1 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -26,7 +26,7 @@ $content[special_rows]
{--CATNAME--}{--CATEGORY_NAME--} {--SELECT_CAT--}
-
{--CLICK_STATISTICS--}
+
{--MEMBER_CLICK_STATISTICS--}