From 34b1f5b69205b08c760d6dcc87ef6a2d1c291261 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 29 Jun 2011 16:14:09 +0000 Subject: [PATCH] Extension ext-coupon basicly finished, no shortcuts in naming: - Extension ext-coupon basicly finished: Please test it intensively now - Renamed all _UID to _USERID, we don't want to shortcut words - Minior renames/improvements here and there - TODOs.txt updated --- .gitattributes | 6 ++ DOCS/TODOs.txt | 4 +- inc/extensions/ext-coupon.php | 5 +- inc/functions.php | 2 +- inc/language/beg_de.php | 12 +-- inc/language/coupon_de.php | 19 +++- inc/language/de.php | 8 +- inc/language/transfer_de.php | 6 +- inc/libs/user_functions.php | 2 +- inc/mails/doubler_mails.php | 6 +- inc/modules/admin/overview-inc.php | 2 +- inc/modules/admin/what-list_coupon.php | 90 ++++++++++++++++ inc/modules/guest/what-beg.php | 2 +- inc/modules/member/action-coupon.php | 4 +- inc/modules/member/what-beg.php | 2 +- inc/modules/member/what-cash_coupon.php | 10 +- inc/modules/member/what-list_coupon.php | 100 ++++++++++++++++++ .../de/emails/admin/admin_mydata_notify.tpl | 2 +- templates/de/html/admin/admin_config_beg.tpl | 2 +- .../de/html/admin/admin_del_surfbar_urls.tpl | 2 +- .../de/html/admin/admin_edit_surfbar_urls.tpl | 2 +- .../de/html/admin/admin_list_autopurge.tpl | 2 +- templates/de/html/admin/admin_list_beg.tpl | 2 +- templates/de/html/admin/admin_list_bonus.tpl | 2 +- .../de/html/admin/admin_list_chk_reg.tpl | 4 +- templates/de/html/admin/admin_list_coupon.tpl | 44 ++++++++ .../de/html/admin/admin_list_coupon_row.tpl | 29 +++++ .../html/admin/admin_list_doubler_already.tpl | 2 +- .../html/admin/admin_list_doubler_waiting.tpl | 2 +- .../de/html/admin/admin_list_holiday.tpl | 2 +- templates/de/html/admin/admin_list_online.tpl | 2 +- .../de/html/admin/admin_list_payouts.tpl | 2 +- .../de/html/admin/admin_list_primera_main.tpl | 2 +- .../de/html/admin/admin_list_rallye_usr.tpl | 2 +- templates/de/html/admin/admin_list_refs.tpl | 2 +- .../de/html/admin/admin_list_refs_level.tpl | 2 +- .../de/html/admin/admin_list_surfbar_urls.tpl | 2 +- templates/de/html/admin/admin_list_task.tpl | 2 +- .../de/html/admin/admin_list_task_delete.tpl | 2 +- .../de/html/admin/admin_list_transfer.tpl | 4 +- .../de/html/admin/admin_list_user_row.tpl | 4 +- .../de/html/admin/admin_list_wernis_main.tpl | 2 +- .../de/html/admin/admin_lock_surfbar_urls.tpl | 2 +- .../de/html/admin/admin_overview_table.tpl | 2 +- .../de/html/admin/admin_surfbar_stats.tpl | 2 +- .../de/html/admin/admin_surfbar_url_stats.tpl | 2 +- .../admin/admin_undelete_surfbar_urls.tpl | 2 +- .../html/admin/admin_unlock_surfbar_urls.tpl | 2 +- .../de/html/admin/admin_user_details.tpl | 4 +- templates/de/html/beg/beg_done.tpl | 2 +- .../de/html/guest/guest_active_table.tpl | 2 +- .../de/html/guest/guest_doubler_list.tpl | 2 +- templates/de/html/guest/guest_rallye.tpl | 2 +- templates/de/html/guest/guest_top10.tpl | 6 +- templates/de/html/member/member_bonus.tpl | 2 +- .../de/html/member/member_doubler_list.tpl | 4 +- templates/de/html/member/member_list_beg.tpl | 4 +- .../de/html/member/member_list_beg_row.tpl | 16 ++- .../de/html/member/member_list_coupon.tpl | 38 +++++++ .../de/html/member/member_list_coupon_row.tpl | 23 ++++ .../de/html/member/member_ref_list_level.tpl | 2 +- .../de/html/member/member_transfer_new.tpl | 2 +- templates/de/html/show_bonus_msg.tpl | 2 +- 63 files changed, 440 insertions(+), 88 deletions(-) create mode 100644 inc/modules/admin/what-list_coupon.php create mode 100644 inc/modules/member/what-list_coupon.php create mode 100644 templates/de/html/admin/admin_list_coupon.tpl create mode 100644 templates/de/html/admin/admin_list_coupon_row.tpl create mode 100644 templates/de/html/member/member_list_coupon.tpl create mode 100644 templates/de/html/member/member_list_coupon_row.tpl diff --git a/.gitattributes b/.gitattributes index 5ada37c7a4..58193006ae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -506,6 +506,7 @@ inc/modules/admin/what-list_beg.php svneol=native#text/plain inc/modules/admin/what-list_bonus.php svneol=native#text/plain inc/modules/admin/what-list_cats.php svneol=native#text/plain inc/modules/admin/what-list_country.php svneol=native#text/plain +inc/modules/admin/what-list_coupon.php svneol=native#text/plain inc/modules/admin/what-list_doubler.php svneol=native#text/plain inc/modules/admin/what-list_holiday.php svneol=native#text/plain inc/modules/admin/what-list_links.php svneol=native#text/plain @@ -624,6 +625,7 @@ inc/modules/member/what-doubler.php svneol=native#text/plain inc/modules/member/what-guest.php svneol=native#text/plain inc/modules/member/what-holiday.php svneol=native#text/plain inc/modules/member/what-html_mail.php svneol=native#text/plain +inc/modules/member/what-list_coupon.php svneol=native#text/plain inc/modules/member/what-logout.php svneol=native#text/plain inc/modules/member/what-mydata.php svneol=native#text/plain inc/modules/member/what-nickname.php svneol=native#text/plain @@ -1180,6 +1182,8 @@ templates/de/html/admin/admin_list_country_edit_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_country_form.tpl svneol=native#text/plain templates/de/html/admin/admin_list_country_no_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_country_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_coupon.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_coupon_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_doubler_already.tpl svneol=native#text/plain templates/de/html/admin/admin_list_doubler_overview.tpl svneol=native#text/plain templates/de/html/admin/admin_list_doubler_waiting.tpl svneol=native#text/plain @@ -1593,6 +1597,8 @@ templates/de/html/member/member_holiday_form.tpl svneol=native#text/plain templates/de/html/member/member_html_mail_settings.tpl svneol=native#text/plain templates/de/html/member/member_list_beg.tpl svneol=native#text/plain templates/de/html/member/member_list_beg_row.tpl svneol=native#text/plain +templates/de/html/member/member_list_coupon.tpl svneol=native#text/plain +templates/de/html/member/member_list_coupon_row.tpl svneol=native#text/plain templates/de/html/member/member_login_js.tpl svneol=native#text/plain templates/de/html/member/member_mail_bonus_deleted.tpl svneol=native#text/plain templates/de/html/member/member_mail_bonus_new.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 3594f60b0d..dc27b17f83 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -155,7 +155,7 @@ ./inc/modules/admin/what-unlock_emails.php:84: // @TODO Rewrite these if-blocks to a filter ./inc/modules/admin/what-usage.php:87: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php ./inc/modules/admin/what-usr_online.php:49: // @TODO Add a filter for sponsor -./inc/modules/guest/what-beg.php:51:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getBegUseridTimeout())); +./inc/modules/guest/what-beg.php:51:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout())); ./inc/modules/guest/what-login.php:121: // @TODO Move this HTML code into a template ./inc/modules/guest/what-mediadata.php:181:// @TODO Rewrite all these if-blocks to filters ./inc/modules/guest/what-mediadata.php:68: // @TODO Find a better formular than this one @@ -164,7 +164,7 @@ ./inc/modules/guest/what-stats.php:100: // @TODO This can be somehow rewritten ./inc/modules/guest/what-stats.php:74:// @TODO This can be rewritten in a dynamic include ./inc/modules/member/what-beg.php:54:// @TODO Can't this be moved into EL? -./inc/modules/member/what-beg.php:63:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getBegUseridTimeout())); +./inc/modules/member/what-beg.php:63:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout())); ./inc/modules/member/what-bonus.php:55: // @TODO Rewrite this to a filter ./inc/modules/member/what-categories.php:131: // @TODO Rewrite this to use $OUT .= ... ./inc/modules/member/what-logout.php:17: * @TODO Rewrite the code to a filter * diff --git a/inc/extensions/ext-coupon.php b/inc/extensions/ext-coupon.php index 7d8755c03b..2f223f2fb2 100644 --- a/inc/extensions/ext-coupon.php +++ b/inc/extensions/ext-coupon.php @@ -48,9 +48,6 @@ setThisExtensionVersion('0.0'); // Version history array (add more with , '0.1' and so on) setExtensionVersionHistory(array('0.0')); -// This extension is in development (non-productive) -enableExtensionProductive(false); - switch (getExtensionMode()) { case 'register': // Do stuff when installtion is running // This extension requires an up-to-date user @@ -64,7 +61,7 @@ switch (getExtensionMode()) { `coupon_expired` TIMESTAMP NULL DEFAULT NULL, `coupon_type` ENUM('CODE','API') NOT NULL DEFAULT 'CODE', `total_created` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -`total_used` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`total_cashed` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `points` FLOAT(20,5) NOT NULL DEFAULT 0.00000, `coupon_description` TEXT, PRIMARY KEY (`id`) diff --git a/inc/functions.php b/inc/functions.php index 1d535c60b6..f081487413 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1191,7 +1191,7 @@ function getMessageFromErrorCode ($code) { case getCode('ACCOUNT_LOCKED') : $message = '{--LOGIN_STATUS_LOCKED--}'; break; case getCode('ACCOUNT_UNCONFIRMED'): $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break; case getCode('COOKIES_DISABLED') : $message = '{--LOGIN_COOKIES_DISABLED--}'; break; - case getCode('BEG_SAME_AS_OWN') : $message = '{--BEG_SAME_UID_AS_OWN--}'; break; + case getCode('BEG_SAME_AS_OWN') : $message = '{--BEG_SAME_USERID_AS_OWN--}'; break; case getCode('LOGIN_FAILED') : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break; case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break; case getCode('OVERLENGTH') : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break; diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php index 4055aaa394..94293e5d8f 100644 --- a/inc/language/beg_de.php +++ b/inc/language/beg_de.php @@ -45,13 +45,13 @@ addMessages(array( 'ADMIN_EDIT_BEG_SETTINGS' => "Einstellungen am Bettel-Link", 'ADMIN_BEG_POINTS' => "{?POINTS?}-Gutschrift bei Klick auf Bettel-Link", 'ADMIN_CONFIG_BEG_TIMEOUT' => "Zeitsperre global", - 'ADMIN_CONFIG_BEG_UID_TIMEOUT' => "Zeitsperre gegen eine Mitglieder-Id", + 'ADMIN_CONFIG_BEG_USERID_TIMEOUT' => "Zeitsperre gegen eine Mitglieder-Id", 'ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT' => "Zeitsperre gegen eine IP-Nummer", 'BEG_LINK_BY' => "Bettel-Link bei {?MAIN_TITLE?}", 'BEG_LINK_USERID' => "Unser Mitglied %s hat {?POINTS?} gebettelt.", - 'BEG_UID_STEAL_1' => "Das Mitglied ", - 'BEG_UID_STEAL_2' => " hat soeben ", - 'BEG_UID_STEAL_3' => " {?POINTS?} bei Ihnen erbettelt.", + 'BEG_USERID_STEAL_1' => "Das Mitglied ", + 'BEG_USERID_STEAL_2' => " hat soeben ", + 'BEG_USERID_STEAL_3' => " {?POINTS?} bei Ihnen erbettelt.", 'BEG_CLICKS' => "Dies war insgesamt der %s. Klick auf sein Bettel-Link.", 'BEG_THANKS_FOR_CLICK' => "Danke für Ihre Spende.", 'BEG_CONTINUE_REGISTER' => "Und weiter geht es zur Anmeldung bei {?MAIN_TITLE?} ...", @@ -78,7 +78,7 @@ addMessages(array( 'BEG_SORRY_YOURE_LOGGED_IN_1' => "Oh, schade! Sie haben vermutlich auf Ihren eigenen Bettel-Link mit der Mitglieder-Id ", 'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine ", 'BEG_SORRY_YOURE_LOGGED_IN_3' => " {?POINTS?} erhalten.", - 'BEG_SAME_UID_AS_OWN' => "Mitglieder-Id des Webmasters benutzt.", + 'BEG_SAME_USERID_AS_OWN' => "Mitglieder-Id des Webmasters benutzt.", // Pay modes 'ADMIN_BEG_PAY_MODE' => "Wie sollen {?POINTS?} vergütet werden?", @@ -114,7 +114,7 @@ addMessages(array( 'BEG_RALLYE_CONDITION_2' => "Es kann jeder dran teilnehmen, der Mitglied bei diesem {?mt_word?} ({?MAIN_TITLE?}) und freigegeben ist.", 'BEG_RALLYE_CONDITION_3' => "Zur Erstellung des Rallye-Ergebnisses werden alle erbettelten {?POINTS?} berücksichtig.", 'BEG_RALLYE_CONDITION_4' => "Der Rechtsweg ist ausgeschlossen.", - 'MEMBER_BEG_HERE_IS_THE_LIST' => "Hier finden Sie die aktuelle Liste mit den möglichen Gewinnern.", + 'MEMBER_LIST_BEG_RALLYE_TITLE' => "Hier finden Sie die aktuelle Liste mit den möglichen Gewinnern.", 'BEG_LINK_HERE' => "Betteln Sie am Besten gleich los! Hier ist der Link dazu.", 'ADMIN_BEG_RANKS' => "Anzahl Gewinner der Bettel-Rallye", 'BEG_MONTHLY_RALLYE' => "GEWONNEN: Monatliche Bettel-Rallye", diff --git a/inc/language/coupon_de.php b/inc/language/coupon_de.php index b5e760f6f7..41b1931a55 100644 --- a/inc/language/coupon_de.php +++ b/inc/language/coupon_de.php @@ -61,19 +61,36 @@ addMessages(array( 'ADMIN_SEND_COUPON_POINTS_NOT_ENTERED' => "Bitte geben Sie eine Vergütung (in {?POINTS?}) ein.", 'ADMIN_SEND_COUPON_DESCRIPTION_NOT_ENTERED' => "Bitte geben Sie eine kurze Beschreibung (oder einen Hinweis an Ihre Mitglieder) ein.", + // Admin - More + 'ADMIN_LIST_CASHED_COUPONS_TITLE' => "Administrative Auflistung aller Gutscheine", + 'ADMIN_LIST_CASHED_COUPONS_NOTE' => "Bitte beachten Sie, dass diese Tabelle alle Gutscheineinträge verknüft mit den Mitgliedern anzeigt. Es kann also sehr oft vorkommen, dass eine {--COUPON_ID--} mehrfach vorkommt.", + 'ADMIN_LIST_COUPON_404' => "Sie haben noch keine Gutscheine versendet, daher sind auch keine auflistbar.", + // Member 'MEMBER_CASH_COUPON_TITLE' => "Gutschein einlösen", 'MEMBER_CASH_COUPON_NOTE' => "Geben Sie hier den Gutschein-Code ein, den Sie aus unserer Mail erhalten haben. Sie erhalten dann eine Meldung, auf welches Konto die Gutschrift aufgebucht wurde.", 'MEMBER_CASH_COUPON' => "Gutschein einlösen", 'MEMBER_ENTER_COUPON_CODE' => "Gutschein-Code eingeben:", 'MEMBER_COUPON_CODE_EMPTY' => "Sie haben keinen Gutschein-Code eingegeben. Bitte versuchen Sie es erneut.", - 'MEMBER_COUPON_CODE_ALREADY_USED' => "Der von Ihnen eingegebene Gutschein-Code ist entweder ungütig, Ihnen nicht zugewiesen, bereits abgelaufen, oder Sie haben ihn bereits eingelöst.", + 'MEMBER_COUPON_CODE_ALREADY_CASHED' => "Der von Ihnen eingegebene Gutschein-Code ist entweder ungütig, Ihnen nicht zugewiesen, bereits abgelaufen, oder Sie haben ihn bereits eingelöst.", 'MEMBER_COUPON_CODE_CASHED' => "Ihr Gutschein im Wert von {%%pipe,translateComma=%s%%} {?POINTS?} wurde soeben eingelöst und Ihrem Konto gutgeschrieben.", + 'MEMBER_COUPON_CASHED_404' => "Sie haben noch keinen Gutschein eingelöst oder es wurde noch keiner erstellt. Bitte prüfen Sie Ihre Emails, ob Sie eventuell einen erhalten haben, den Sie noch einlösen können.", + 'MEMBER_LIST_CASHED_COUPONS_TITLE' => "Alle Ihre eingelösten Gutscheine", + 'MEMBER_LIST_CASHED_COUPONS_NOTE' => "Bitte beachten Sie, dass Gutscheine nach {%config,createFancyTime=coupon_autopurge_time%} automatisch aus der Datenbank entfernt werden und Ihnen dann nicht mehr angezeigt werden. Das {?POINTS?}-Guthaben behalten Sie weiterhin.", // Subject lines 'MEMBER_COUPON_SUBJECT' => "Gutschein bei {?MAIN_TITLE?}", 'ADMIN_COUPON_SUBJECT' => "Es wurde ein Gutschein versendet", 'ADMIN_COUPON_CASHED_SUBJECT' => "Ein Mitglied hat seinen Gutschein eingelöst", + + // Language strings for admin/member + 'COUPON_ID' => "Gutscheinnummer", + 'COUPON_CASHED_ON' => "Eingelöst am", + 'COUPON_CREATED_ON' => "Erstellt am", + 'COUPON_EXPIRED_ON' => "Abgelaufen am", + 'COUPON_TOTAL_CREATED' => "Erstellt", + 'COUPON_TOTAL_CASHED' => "Eingelöst", + 'COUPON_DESCRIPTION' => "Hinweistext", )); // [EOF] diff --git a/inc/language/de.php b/inc/language/de.php index 520d11e5be..c9ac224e46 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -311,7 +311,7 @@ addMessages(array( 'MEMBER_MYDATA_MAIL_SENT' => "Es ist eine Email zu Ihnen unterwegs.", 'ADMIN_CHANGED_DATA' => "Profildaten geändert", 'ADMIN_MEMBER_CHANGED_PROFILE' => "Eines Ihrer Mitglieder hat seine Profildaten geändert.", - 'MEMBER_UID' => "Seine Login-Id lautet", + 'MEMBER_USERID' => "Seine Login-Id lautet", 'LOGOUT_DONE' => "Ausloggen abgeschlossen.", 'LOGOUT_FAILED' => "Ausloggen fehlgeschlagen.", 'MEMBER_NO_CATEGORIES' => "Es wurden bis jetzt noch keine Kategorien eingerichtet.", @@ -456,9 +456,9 @@ addMessages(array( 'MAIL_STATS_404' => "Konnte Daten aus der Statistik-Tabelle nicht laden.", 'USER_404' => "Mitgliedsdaten nicht gefunden! Sind Sie noch angemeldet?", 'ADMIN_UNCONFIRMED_ACCOUNTS' => "Hier alle Accounts, deren Email-Adresse nicht bestätigt ist", - '_UID' => "Mitglieder-Id", + '_USERID' => "Mitglieder-Id", 'REMOTE_IP' => "IP-Nummer", - 'REFERAL_UID' => "Werber-Id", + 'REFERAL_USERID' => "Werber-Id", 'ACCOUNT_STATUS' => "Account-Status", 'ACCOUNT_STATUS_UNKNOWN' => "Unbekannter Status %s erkannt.", 'ACCOUNT_STATUS_UNCONFIRMED' => "Unbestätigt", @@ -613,7 +613,7 @@ addMessages(array( 'MEMBER_NO_REFBANNER_FOUND' => "Es sind noch keine Werbebanner eingerichtet worden. Bitte verwenden Sie solange Ihren Referal-Link.", 'ADMIN_ID_404' => "ID %s nicht gefunden.", 'ADMIN_ASSIGNED_ADMIN' => "Zugewiesener Admin", - 'ADMIN_MEMBER_UID' => "ID des Mitgliedes", + 'ADMIN_MEMBER_USERID' => "ID des Mitgliedes", 'ADMIN_TASK_TYPE' => "Aufgabenbereich", 'ADMIN_TASK_CREATED' => "Aufgabe erstellt", 'ADMIN_NO_ADMIN_ASSIGNED' => "Kein Admin-Login zugewiesen.", diff --git a/inc/language/transfer_de.php b/inc/language/transfer_de.php index 2e62574bf6..89c2bc566e 100644 --- a/inc/language/transfer_de.php +++ b/inc/language/transfer_de.php @@ -58,7 +58,7 @@ addMessages(array( 'TRANSFER_PLEASE_ALLOW_OPT_IN' => "Bitte erst Empfangen von Überweisungen erlauben.", 'TRANSFER_NOW_LINK' => "Überweisung zum anderen Mitglied tätigen", 'TRANSFER_NOW_TITLE' => "Starten Sie hier eine Überweisung von {?POINTS?} an ein anderes Mitglied.", - 'TRANSFER_SELECT_TARGET_UID' => "Empfänger auswählen", + 'TRANSFER_SELECT_TARGET_USERID' => "Empfänger auswählen", 'TRANSFER_NO_ONE_ELSE_OPT_IN' => "Niemand weiteres möchte Überweisungen empfangen.", 'TRANSFER_POINTS_MAXIMUM' => "Maximaler Betrag", 'TRANSFER_POINTS_AMOUNT' => "Zu überweisende {?POINTS?}", @@ -90,8 +90,8 @@ addMessages(array( 'TRANSFER_ID' => "Trans-Id", 'TRANSFER_STAMP' => "Buchungstag", 'TRANSFER_PARTY' => "Empf./Sender", - 'TRANSFER_FROM_UID' => "Sender", - 'TRANSFER_TO_UID' => "Empfänger", + 'TRANSFER_FROM_USERID' => "Sender", + 'TRANSFER_TO_USERID' => "Empfänger", 'TRANSFER_TOTAL_SUM' => "Gesamt transferierte {?POINTS?}", 'TRANSFER_DELETE' => "Einträge löschen", )); diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 838c8db00f..4b4addc615 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -103,7 +103,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) { // Prepare array with all possible sorters $list = array( - 'userid' => '{--_UID--}', + 'userid' => '{--_USERID--}', 'family' => '{--FAMILY--}', 'email' => '{--EMAIL--}', 'REMOTE_ADDR' => '{--REMOTE_IP--}' diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php index 91f3988d91..038086d566 100644 --- a/inc/mails/doubler_mails.php +++ b/inc/mails/doubler_mails.php @@ -63,9 +63,9 @@ if ($DOUBLER_POINTS == '0') { } // END - if // If not currently doubled set it to zero -unsetGetRequestParameter('DOUBLER_UID'); -unsetPostRequestParameter('DOUBLER_UID'); -setSession('DOUBLER_UID', ''); +unsetGetRequestParameter('DOUBLER_USERID'); +unsetPostRequestParameter('DOUBLER_USERID'); +setSession('DOUBLER_USERID', ''); if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0'; // Check for doubles which we can pay out diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index e88441e131..859996d901 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -174,7 +174,7 @@ LIMIT 1", $content = getUserDataArray(); // Generate HTML list entry - $add = '
  • {--ADMIN_MEMBER_UID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' ({%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; + $add = '
  • {--ADMIN_MEMBER_USERID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' ({%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; } else { // Invalid userid, so log and zero it logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.'); diff --git a/inc/modules/admin/what-list_coupon.php b/inc/modules/admin/what-list_coupon.php new file mode 100644 index 0000000000..0069ce021d --- /dev/null +++ b/inc/modules/admin/what-list_coupon.php @@ -0,0 +1,90 @@ + 0) { + // Init variable + $OUT = ''; + + // Load all rows + while ($content = SQL_FETCHARRAY($result)) { + // Translate all timestamps + $content['cashed_on'] = generateDateTime($content['cashed_on'] , '2'); + $content['coupon_created'] = generateDateTime($content['coupon_created'], '2'); + $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2'); + + // Add the row template + $OUT .= loadTemplate('admin_list_coupon_row', true, $content); + } // END - while + + // Load main template + loadTemplate('admin_list_coupon', false, $OUT); +} else { + // No cashed coupons found + displayMessage('{--ADMIN_LIST_COUPON_404--}'); +} + +// Free result +SQL_FREERESULT($result); + +// [EOF] +?> diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php index 7dc84d0105..06d0321683 100644 --- a/inc/modules/guest/what-beg.php +++ b/inc/modules/guest/what-beg.php @@ -48,7 +48,7 @@ if ((!isExtensionActive('beg')) && (!isAdmin())) { return; } // END - if -// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getBegUseridTimeout())); +// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout())); // Load final template loadTemplate('guest_beg'); diff --git a/inc/modules/member/action-coupon.php b/inc/modules/member/action-coupon.php index 645231f7e0..0d28088029 100644 --- a/inc/modules/member/action-coupon.php +++ b/inc/modules/member/action-coupon.php @@ -1,7 +1,7 @@ 0) { + // Init variable + $OUT = ''; + + // Load all rows + while ($content = SQL_FETCHARRAY($result)) { + // Translate all timestamps + $content['cashed_on'] = generateDateTime($content['cashed_on'] , '2'); + $content['coupon_created'] = generateDateTime($content['coupon_created'], '2'); + $content['coupon_expired'] = generateDateTime($content['coupon_expired'], '2'); + + // Add the row template + $OUT .= loadTemplate('member_list_coupon_row', true, $content); + } // END - while + + // Load main template + loadTemplate('member_list_coupon', false, $OUT); +} else { + // No cashed coupons found + displayMessage('{--MEMBER_COUPON_CASHED_404--}'); +} + +// Free result +SQL_FREERESULT($result); + +// [EOF] +?> diff --git a/templates/de/emails/admin/admin_mydata_notify.tpl b/templates/de/emails/admin/admin_mydata_notify.tpl index 66a356dd2e..0b48f39765 100644 --- a/templates/de/emails/admin/admin_mydata_notify.tpl +++ b/templates/de/emails/admin/admin_mydata_notify.tpl @@ -3,7 +3,7 @@ Hallo Administrator, {--ADMIN_MEMBER_CHANGED_PROFILE--} ------------------------------------------ -{--MEMBER_UID--}: $userid +{--MEMBER_USERID--}: $userid ------------------------------------------ {--GENDER--}: {%user,gender,translateGender=$userid%} {--SURNAME--}: {%user,surname=$userid%} diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index b7ef6a3852..49e80b8065 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -32,7 +32,7 @@ - {--ADMIN_CONFIG_BEG_UID_TIMEOUT--}: + {--ADMIN_CONFIG_BEG_USERID_TIMEOUT--}: $content[userid_timeout] diff --git a/templates/de/html/admin/admin_del_surfbar_urls.tpl b/templates/de/html/admin/admin_del_surfbar_urls.tpl index 8aa8aeea4e..6a054adce1 100644 --- a/templates/de/html/admin/admin_del_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_del_surfbar_urls.tpl @@ -7,7 +7,7 @@ - {--_UID--} + {--_USERID--} {--ADMIN_TEST_URL--} {--ADMIN_SURFBAR_REGISTERED--} diff --git a/templates/de/html/admin/admin_edit_surfbar_urls.tpl b/templates/de/html/admin/admin_edit_surfbar_urls.tpl index 023ced51aa..fac0758540 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls.tpl @@ -7,7 +7,7 @@ - {--_UID--} + {--_USERID--} {--ADMIN_TEST_URL--} $content diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl index c266e2f9d5..bf62f4f0a4 100644 --- a/templates/de/html/admin/admin_list_autopurge.tpl +++ b/templates/de/html/admin/admin_list_autopurge.tpl @@ -6,7 +6,7 @@ - {--_UID--} + {--_USERID--} {--GENDER--} {--SURNAME--} {--FAMILY--} diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl index 3c1bdb25d7..6ad91d9822 100644 --- a/templates/de/html/admin/admin_list_beg.tpl +++ b/templates/de/html/admin/admin_list_beg.tpl @@ -10,7 +10,7 @@ {--BEG_RANK--} - {--_UID--}: + {--_USERID--}: {--SURNAME_FAMILY--}: diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl index e10febf2e3..4e546274d4 100644 --- a/templates/de/html/admin/admin_list_bonus.tpl +++ b/templates/de/html/admin/admin_list_bonus.tpl @@ -10,7 +10,7 @@ {--BONUS_RANK--} - {--_UID--}: + {--_USERID--}: {--SURNAME_FAMILY--}: diff --git a/templates/de/html/admin/admin_list_chk_reg.tpl b/templates/de/html/admin/admin_list_chk_reg.tpl index a1f9376b9c..39caff4632 100644 --- a/templates/de/html/admin/admin_list_chk_reg.tpl +++ b/templates/de/html/admin/admin_list_chk_reg.tpl @@ -6,13 +6,13 @@ - {--_UID--} + {--_USERID--} {--GENDER--} {--SURNAME--} {--FAMILY--} {--EMAIL--} {--REMOTE_IP--} - {--REFERAL_UID--} + {--REFERAL_USERID--} {--ADMIN_CONFIRM_ACCOUNT--} $content diff --git a/templates/de/html/admin/admin_list_coupon.tpl b/templates/de/html/admin/admin_list_coupon.tpl new file mode 100644 index 0000000000..f383293dd7 --- /dev/null +++ b/templates/de/html/admin/admin_list_coupon.tpl @@ -0,0 +1,44 @@ +
    + + + + + + + + + + + + + + + +$content + + + +
    + {--ADMIN_LIST_CASHED_COUPONS_TITLE--} +
    + {--COUPON_ID--} + + {--_USERID--} + + {?POINTS?} + + {--COUPON_CASHED_ON--} + + {--COUPON_CREATED_ON--} + + {--COUPON_EXPIRED_ON--} + + {--COUPON_TOTAL_CREATED--} + + {--COUPON_TOTAL_CASHED--} + + {--COUPON_DESCRIPTION--} +
    +
    {--ADMIN_LIST_CASHED_COUPONS_NOTE--}
    +
    +
    diff --git a/templates/de/html/admin/admin_list_coupon_row.tpl b/templates/de/html/admin/admin_list_coupon_row.tpl new file mode 100644 index 0000000000..66b92ad8d5 --- /dev/null +++ b/templates/de/html/admin/admin_list_coupon_row.tpl @@ -0,0 +1,29 @@ + + + $content[coupon_id] + + + {%pipe,generateUserProfileLink=$content[userid]%} + + + {%pipe,translateComma=$content[points]%} + + + $content[cashed_on] + + + $content[coupon_created] + + + $content[coupon_expired] + + + {%pipe,translateComma=$content[total_created]%} + + + {%pipe,translateComma=$content[total_cashed]%} + + + $content[coupon_description] + + diff --git a/templates/de/html/admin/admin_list_doubler_already.tpl b/templates/de/html/admin/admin_list_doubler_already.tpl index 4b9b686a5d..15d7591c5b 100644 --- a/templates/de/html/admin/admin_list_doubler_already.tpl +++ b/templates/de/html/admin/admin_list_doubler_already.tpl @@ -7,7 +7,7 @@ -
    {--_UID--}:
    +
    {--_USERID--}:
    {?POINTS?}:
    diff --git a/templates/de/html/admin/admin_list_doubler_waiting.tpl b/templates/de/html/admin/admin_list_doubler_waiting.tpl index a69921ebc1..d964e2e155 100644 --- a/templates/de/html/admin/admin_list_doubler_waiting.tpl +++ b/templates/de/html/admin/admin_list_doubler_waiting.tpl @@ -6,7 +6,7 @@ - {--_UID--}: + {--_USERID--}: {?POINTS?}: {--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}: {--REMOTE_IP--}: diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl index 244096b3a0..90d5f79958 100644 --- a/templates/de/html/admin/admin_list_holiday.tpl +++ b/templates/de/html/admin/admin_list_holiday.tpl @@ -3,7 +3,7 @@ - + diff --git a/templates/de/html/admin/admin_list_online.tpl b/templates/de/html/admin/admin_list_online.tpl index 2562746f52..b4c08edf04 100644 --- a/templates/de/html/admin/admin_list_online.tpl +++ b/templates/de/html/admin/admin_list_online.tpl @@ -7,7 +7,7 @@ - + diff --git a/templates/de/html/admin/admin_list_payouts.tpl b/templates/de/html/admin/admin_list_payouts.tpl index 9c61878b13..a50ed1416d 100644 --- a/templates/de/html/admin/admin_list_payouts.tpl +++ b/templates/de/html/admin/admin_list_payouts.tpl @@ -6,7 +6,7 @@ - + diff --git a/templates/de/html/admin/admin_list_primera_main.tpl b/templates/de/html/admin/admin_list_primera_main.tpl index 3126600bc3..17f5ae699d 100644 --- a/templates/de/html/admin/admin_list_primera_main.tpl +++ b/templates/de/html/admin/admin_list_primera_main.tpl @@ -7,7 +7,7 @@ - + diff --git a/templates/de/html/admin/admin_list_rallye_usr.tpl b/templates/de/html/admin/admin_list_rallye_usr.tpl index 61bd4b8fa8..78183e012e 100644 --- a/templates/de/html/admin/admin_list_rallye_usr.tpl +++ b/templates/de/html/admin/admin_list_rallye_usr.tpl @@ -6,7 +6,7 @@ - + diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index 947fd18d40..fa2ed988d3 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -6,7 +6,7 @@ - + diff --git a/templates/de/html/admin/admin_list_refs_level.tpl b/templates/de/html/admin/admin_list_refs_level.tpl index dd97103b41..1ce28a941e 100644 --- a/templates/de/html/admin/admin_list_refs_level.tpl +++ b/templates/de/html/admin/admin_list_refs_level.tpl @@ -8,7 +8,7 @@ - + diff --git a/templates/de/html/admin/admin_list_surfbar_urls.tpl b/templates/de/html/admin/admin_list_surfbar_urls.tpl index ac72dae431..1b80e70c87 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls.tpl @@ -8,7 +8,7 @@ - + diff --git a/templates/de/html/admin/admin_list_task.tpl b/templates/de/html/admin/admin_list_task.tpl index 5a3901b7c5..4ec5340251 100644 --- a/templates/de/html/admin/admin_list_task.tpl +++ b/templates/de/html/admin/admin_list_task.tpl @@ -11,7 +11,7 @@ - + diff --git a/templates/de/html/admin/admin_list_task_delete.tpl b/templates/de/html/admin/admin_list_task_delete.tpl index 36a8275695..bada729350 100644 --- a/templates/de/html/admin/admin_list_task_delete.tpl +++ b/templates/de/html/admin/admin_list_task_delete.tpl @@ -11,7 +11,7 @@ - + diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl index 372aee856d..b354570efb 100644 --- a/templates/de/html/admin/admin_list_transfer.tpl +++ b/templates/de/html/admin/admin_list_transfer.tpl @@ -14,10 +14,10 @@ {--TRANSFER_STAMP--} - + @@ -15,7 +15,7 @@ - + diff --git a/templates/de/html/admin/admin_list_wernis_main.tpl b/templates/de/html/admin/admin_list_wernis_main.tpl index 12fc3eff51..d71db91579 100644 --- a/templates/de/html/admin/admin_list_wernis_main.tpl +++ b/templates/de/html/admin/admin_list_wernis_main.tpl @@ -7,7 +7,7 @@ - + diff --git a/templates/de/html/admin/admin_lock_surfbar_urls.tpl b/templates/de/html/admin/admin_lock_surfbar_urls.tpl index aefdd5cfec..0a9b83689c 100644 --- a/templates/de/html/admin/admin_lock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_lock_surfbar_urls.tpl @@ -7,7 +7,7 @@ - + diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl index aa1c368e70..f4a3297a5d 100644 --- a/templates/de/html/admin/admin_overview_table.tpl +++ b/templates/de/html/admin/admin_overview_table.tpl @@ -11,7 +11,7 @@ - + diff --git a/templates/de/html/admin/admin_surfbar_stats.tpl b/templates/de/html/admin/admin_surfbar_stats.tpl index 5b7fdea77b..ce8bcadb17 100644 --- a/templates/de/html/admin/admin_surfbar_stats.tpl +++ b/templates/de/html/admin/admin_surfbar_stats.tpl @@ -7,7 +7,7 @@ - + diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl index 7fcd2d0f4e..7f73eef3ba 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl @@ -8,7 +8,7 @@ - + diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index d2a5d01f83..d0725355c2 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -2,7 +2,7 @@
    {--ID_SELECT--}{--_UID--}:{--_USERID--}: {--ADMIN_HOLIDAY_TSTART--}: {--ADMIN_HOLIDAY_TEND--}: {--ADMIN_HOLIDAY_COMMENTS--}:
    {--ID_SELECT--}{--_UID--}:{--_USERID--}: {--REMOTE_IP--}: {--_REFID--}: {--_MODULE--}:
    {--_UID--}{--_USERID--} {--PAYOUT_TOTAL_PAYOUT--} {--MEMBER_PAYOUT_TARGET_ACCOUNT2--} {--MEMBER_PAYOUT_TARGET_BANK2--}
    {--ID_SELECT--}{--_UID--}{--_USERID--} {--ADMIN_PRIMERA_ACCOUNT--} {--ADMIN_PRIMERA_TRANSFERED--} {--ADMIN_PRIMERA_TIMESTAMP--}
    {--_UID--}:{--_USERID--}: {--RALLYE_OLD_REFS--}: {--RALLYE_NEW_REFS--}: {--RALLYE_REFERAL_POINTS--}:
    {--_UID--}{--_USERID--} {--REFS_COUNT--} {--SURNAME_FAMILY--} {--EMAIL--}
    {--_UID--}{--_USERID--} {--REFS_COUNT--} {--SURNAME_FAMILY--} {--EMAIL--}
    {--ID_SELECT--}{--_UID--}{--_USERID--} {--ADMIN_TEST_URL--} {--ADMIN_SURFBAR_VIEWS_TOTAL--} {--ADMIN_SURFBAR_STATUS--}{--ADMIN_ASSIGNED_ADMIN--} {--ADMIN_REGISTER_EXTENSION--} {--ADMIN_TASK_INFOS--}{--ADMIN_MEMBER_UID--}{--ADMIN_MEMBER_USERID--} {--ADMIN_TASK_TYPE--} {--ADMIN_TASK_CREATED--}
    {--ADMIN_ASSIGNED_ADMIN--} {--ADMIN_REGISTER_EXTENSION--} {--ADMIN_TASK_INFOS--}{--ADMIN_MEMBER_UID--}{--ADMIN_MEMBER_USERID--} {--ADMIN_TASK_TYPE--} {--ADMIN_TASK_CREATED--}
    - {--TRANSFER_FROM_UID--} + {--TRANSFER_FROM_USERID--} - {--TRANSFER_TO_UID--} + {--TRANSFER_TO_USERID--} {--TRANSFER_POINTS_REASON--} diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index 571662dff3..393cdcb514 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -1,5 +1,5 @@
    {--_UID--}:{--_USERID--}: {--GENDER--}: {--SURNAME--}: {--FAMILY--}:
    {--EMAIL--}: {--REMOTE_IP--}:{--REFERAL_UID--}:{--REFERAL_USERID--}: {--ACCOUNT_STATUS--}: {--UNCONFIRMED_LINKS--}:
    {--ID_SELECT--}{--_UID--}{--_USERID--} {--ADMIN_WERNIS_WDS66_ACCOUNT--} {--ADMIN_WERNIS_TRANSFERED--} {--ADMIN_WERNIS_TIMESTAMP--}
    {--_UID--}{--_USERID--} {--ADMIN_TEST_URL--} {--ADMIN_SURFBAR_STATUS--} {--ADMIN_SURFBAR_REGISTERED--}{--ADMIN_ASSIGNED_ADMIN--} {--ADMIN_REGISTER_EXTENSION--} {--ADMIN_TASK_INFOS--}{--ADMIN_MEMBER_UID--}{--ADMIN_MEMBER_USERID--} {--ADMIN_TASK_TYPE--} {--ADMIN_TASK_CREATED--}
    - {--_UID--}: + {--_USERID--}: {--ADMIN_SURFBAR_VISITED_URLS--}: diff --git a/templates/de/html/admin/admin_surfbar_url_stats.tpl b/templates/de/html/admin/admin_surfbar_url_stats.tpl index 0cc11ba5f7..ddccfdd349 100644 --- a/templates/de/html/admin/admin_surfbar_url_stats.tpl +++ b/templates/de/html/admin/admin_surfbar_url_stats.tpl @@ -7,7 +7,7 @@
    - {--_UID--}: + {--_USERID--}: {--ADMIN_SURFBAR_TOTAL_VISITS--}: diff --git a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl index 91fcf7114b..b46c682a07 100644 --- a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl @@ -7,7 +7,7 @@
    {--_UID--}{--_USERID--} {--ADMIN_TEST_URL--} {--ADMIN_SURFBAR_STATUS--} {--ADMIN_SURFBAR_REGISTERED--}
    {--ID_SELECT--}{--_UID--}{--_USERID--} {--ADMIN_SURFBAR_URL--} {--ADMIN_TEST_URL--} {--ADMIN_SURFBAR_REGISTERED--}
    @@ -61,7 +61,7 @@
    - {--_UID--} $content[userid] + {--_USERID--} $content[userid]
    - {--REFERAL_UID--}:
    + {--REFERAL_USERID--}:
    $content[refid]     		diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl index e148b3fece..53937baace 100644 --- a/templates/de/html/beg/beg_done.tpl +++ b/templates/de/html/beg/beg_done.tpl @@ -1,5 +1,5 @@
    - {--BEG_UID_STEAL_1--}$content[userid]{--BEG_UID_STEAL_2--}{%pipe,translateComma=$content[points]%}{--BEG_UID_STEAL_3--} + {--BEG_USERID_STEAL_1--}$content[userid]{--BEG_USERID_STEAL_2--}{%pipe,translateComma=$content[points]%}{--BEG_USERID_STEAL_3--}
    diff --git a/templates/de/html/guest/guest_active_table.tpl b/templates/de/html/guest/guest_active_table.tpl index caccb1693d..7d6a92e8ef 100644 --- a/templates/de/html/guest/guest_active_table.tpl +++ b/templates/de/html/guest/guest_active_table.tpl @@ -7,7 +7,7 @@
    - {--_UID--}: + {--_USERID--}: {--TOTAL_POINTS--}: diff --git a/templates/de/html/guest/guest_doubler_list.tpl b/templates/de/html/guest/guest_doubler_list.tpl index d54fd1baea..90d3449163 100644 --- a/templates/de/html/guest/guest_doubler_list.tpl +++ b/templates/de/html/guest/guest_doubler_list.tpl @@ -2,7 +2,7 @@
    - {--_UID--} + {--_USERID--} {?POINTS?} diff --git a/templates/de/html/guest/guest_rallye.tpl b/templates/de/html/guest/guest_rallye.tpl index 09548ab4b0..2650ca0fcc 100644 --- a/templates/de/html/guest/guest_rallye.tpl +++ b/templates/de/html/guest/guest_rallye.tpl @@ -2,7 +2,7 @@ - + $content[rows] diff --git a/templates/de/html/guest/guest_top10.tpl b/templates/de/html/guest/guest_top10.tpl index 07e31b2789..44415691d3 100644 --- a/templates/de/html/guest/guest_top10.tpl +++ b/templates/de/html/guest/guest_top10.tpl @@ -11,7 +11,7 @@ Platz:
    {--_RALLYE_PRICE--}{--_UID--}{--_USERID--} {--RALLYE_GUEST_REFS--}
    - {--_UID--}: + {--_USERID--}: {--TOTAL_LOGINS--}: @@ -47,7 +47,7 @@ Platz: - {--_UID--}: + {--_USERID--}: {--TOTAL_POINTS--}: @@ -80,7 +80,7 @@ Platz: - {--_UID--}: + {--_USERID--}: {--TOTAL_REFERALS--}: diff --git a/templates/de/html/member/member_bonus.tpl b/templates/de/html/member/member_bonus.tpl index 5de0ccbe41..0625f107bf 100644 --- a/templates/de/html/member/member_bonus.tpl +++ b/templates/de/html/member/member_bonus.tpl @@ -8,7 +8,7 @@ - + diff --git a/templates/de/html/member/member_doubler_list.tpl b/templates/de/html/member/member_doubler_list.tpl index 45d6145759..b0586dc464 100644 --- a/templates/de/html/member/member_doubler_list.tpl +++ b/templates/de/html/member/member_doubler_list.tpl @@ -1,10 +1,10 @@
    {--BONUS_RANK--}:{--_UID--}:{--_USERID--}: {?POINTS?}: {--LAST_ONLINE_SHORT--}:
    + + + + + + + + diff --git a/templates/de/html/member/member_ref_list_level.tpl b/templates/de/html/member/member_ref_list_level.tpl index efc01c0ef8..6062fc8bc4 100644 --- a/templates/de/html/member/member_ref_list_level.tpl +++ b/templates/de/html/member/member_ref_list_level.tpl @@ -8,7 +8,7 @@
    - {--_UID--} + {--_USERID--} - {--REFERAL_UID--} + {--REFERAL_USERID--} {?POINTS?} diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl index bc60da3f90..9ffa0497b0 100644 --- a/templates/de/html/member/member_list_beg.tpl +++ b/templates/de/html/member/member_list_beg.tpl @@ -1,14 +1,14 @@
    - {--MEMBER_BEG_HERE_IS_THE_LIST--} + {--MEMBER_LIST_BEG_RALLYE_TITLE--}
    - + diff --git a/templates/de/html/member/member_list_beg_row.tpl b/templates/de/html/member/member_list_beg_row.tpl index 6075586f5a..fc6c2c0674 100644 --- a/templates/de/html/member/member_list_beg_row.tpl +++ b/templates/de/html/member/member_list_beg_row.tpl @@ -1,6 +1,14 @@ - - - - + + + + diff --git a/templates/de/html/member/member_list_coupon.tpl b/templates/de/html/member/member_list_coupon.tpl new file mode 100644 index 0000000000..de3e22413d --- /dev/null +++ b/templates/de/html/member/member_list_coupon.tpl @@ -0,0 +1,38 @@ +
    +
    {--BEG_RANK--}:{--_UID--}:{--_USERID--}: {--BEG_POINTS--}: {--LAST_ONLINE_SHORT--}:
    $content[cnt]$content[userid]{%pipe,translateComma=$content[beg_points]%}$content[last_online] + $content[cnt] + + $content[userid] + + {%pipe,translateComma=$content[beg_points]%} + + $content[last_online] +
    + + + + + + + + + + + + +$content + + + +
    + {--MEMBER_LIST_CASHED_COUPONS_TITLE--} +
    + {?POINTS?} + + {--COUPON_CASHED_ON--} + + {--COUPON_CREATED_ON--} + + {--COUPON_EXPIRED_ON--} + + {--COUPON_TOTAL_CREATED--} + + {--COUPON_TOTAL_CASHED--} + + {--COUPON_DESCRIPTION--} +
    +
    {--MEMBER_LIST_CASHED_COUPONS_NOTE--}
    +
    +
    diff --git a/templates/de/html/member/member_list_coupon_row.tpl b/templates/de/html/member/member_list_coupon_row.tpl new file mode 100644 index 0000000000..ebdb625fd9 --- /dev/null +++ b/templates/de/html/member/member_list_coupon_row.tpl @@ -0,0 +1,23 @@ +
    + {%pipe,translateComma=$content[points]%} + + $content[cashed_on] + + $content[coupon_created] + + $content[coupon_expired] + + {%pipe,translateComma=$content[total_created]%} + + {%pipe,translateComma=$content[total_cashed]%} + + $content[coupon_description] +
    - {--_UID--} + {--_USERID--} {--ACCOUNT_STATUS--} diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl index 42569b64a8..8a2f89d787 100644 --- a/templates/de/html/member/member_transfer_new.tpl +++ b/templates/de/html/member/member_transfer_new.tpl @@ -3,7 +3,7 @@
    - {--TRANSFER_SELECT_TARGET_UID--}: + {--TRANSFER_SELECT_TARGET_USERID--}: $content[userid_selection] diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl index d312c9a2a5..d5953d6305 100644 --- a/templates/de/html/show_bonus_msg.tpl +++ b/templates/de/html/show_bonus_msg.tpl @@ -7,7 +7,7 @@ - + $content[rows] -- 2.39.2
    {--BONUS_RANK--}:{--_UID--}:{--_USERID--}: {?POINTS?}: