Extension ext-coupon basicly finished, no shortcuts in naming:
authorRoland Häder <roland@mxchange.org>
Wed, 29 Jun 2011 16:14:09 +0000 (16:14 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 29 Jun 2011 16:14:09 +0000 (16:14 +0000)
- 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

63 files changed:
.gitattributes
DOCS/TODOs.txt
inc/extensions/ext-coupon.php
inc/functions.php
inc/language/beg_de.php
inc/language/coupon_de.php
inc/language/de.php
inc/language/transfer_de.php
inc/libs/user_functions.php
inc/mails/doubler_mails.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-list_coupon.php [new file with mode: 0644]
inc/modules/guest/what-beg.php
inc/modules/member/action-coupon.php
inc/modules/member/what-beg.php
inc/modules/member/what-cash_coupon.php
inc/modules/member/what-list_coupon.php [new file with mode: 0644]
templates/de/emails/admin/admin_mydata_notify.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_del_surfbar_urls.tpl
templates/de/html/admin/admin_edit_surfbar_urls.tpl
templates/de/html/admin/admin_list_autopurge.tpl
templates/de/html/admin/admin_list_beg.tpl
templates/de/html/admin/admin_list_bonus.tpl
templates/de/html/admin/admin_list_chk_reg.tpl
templates/de/html/admin/admin_list_coupon.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_coupon_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_doubler_already.tpl
templates/de/html/admin/admin_list_doubler_waiting.tpl
templates/de/html/admin/admin_list_holiday.tpl
templates/de/html/admin/admin_list_online.tpl
templates/de/html/admin/admin_list_payouts.tpl
templates/de/html/admin/admin_list_primera_main.tpl
templates/de/html/admin/admin_list_rallye_usr.tpl
templates/de/html/admin/admin_list_refs.tpl
templates/de/html/admin/admin_list_refs_level.tpl
templates/de/html/admin/admin_list_surfbar_urls.tpl
templates/de/html/admin/admin_list_task.tpl
templates/de/html/admin/admin_list_task_delete.tpl
templates/de/html/admin/admin_list_transfer.tpl
templates/de/html/admin/admin_list_user_row.tpl
templates/de/html/admin/admin_list_wernis_main.tpl
templates/de/html/admin/admin_lock_surfbar_urls.tpl
templates/de/html/admin/admin_overview_table.tpl
templates/de/html/admin/admin_surfbar_stats.tpl
templates/de/html/admin/admin_surfbar_url_stats.tpl
templates/de/html/admin/admin_undelete_surfbar_urls.tpl
templates/de/html/admin/admin_unlock_surfbar_urls.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/beg/beg_done.tpl
templates/de/html/guest/guest_active_table.tpl
templates/de/html/guest/guest_doubler_list.tpl
templates/de/html/guest/guest_rallye.tpl
templates/de/html/guest/guest_top10.tpl
templates/de/html/member/member_bonus.tpl
templates/de/html/member/member_doubler_list.tpl
templates/de/html/member/member_list_beg.tpl
templates/de/html/member/member_list_beg_row.tpl
templates/de/html/member/member_list_coupon.tpl [new file with mode: 0644]
templates/de/html/member/member_list_coupon_row.tpl [new file with mode: 0644]
templates/de/html/member/member_ref_list_level.tpl
templates/de/html/member/member_transfer_new.tpl
templates/de/html/show_bonus_msg.tpl

index 5ada37c..5819300 100644 (file)
@@ -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
index 3594f60..dc27b17 100644 (file)
 ./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
 ./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                                   *
index 7d8755c..2f223f2 100644 (file)
@@ -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`)
index 1d535c6..f081487 100644 (file)
@@ -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;
index 4055aaa..94293e5 100644 (file)
@@ -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 <strong>{?MAIN_TITLE?}</strong>",
        'BEG_LINK_USERID' => "Unser Mitglied <span class=\"data\">%s</span> 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 <strong>%s.</strong> Klick auf sein Bettel-Link.",
        'BEG_THANKS_FOR_CLICK' => "Danke f&uuml;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&uuml;tet werden?",
@@ -114,7 +114,7 @@ addMessages(array(
        'BEG_RALLYE_CONDITION_2' => "Es kann jeder dran teilnehmen, der Mitglied bei diesem {?mt_word?} (<strong>{?MAIN_TITLE?}</strong>) und freigegeben ist.",
        'BEG_RALLYE_CONDITION_3' => "Zur Erstellung des Rallye-Ergebnisses werden alle erbettelten {?POINTS?} ber&uuml;cksichtig.",
        'BEG_RALLYE_CONDITION_4' => "Der Rechtsweg ist ausgeschlossen.",
-       'MEMBER_BEG_HERE_IS_THE_LIST' => "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern.",
+       'MEMBER_LIST_BEG_RALLYE_TITLE' => "Hier finden Sie die aktuelle Liste mit den m&ouml;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",
index b5e760f..41b1931 100644 (file)
@@ -61,19 +61,36 @@ addMessages(array(
        'ADMIN_SEND_COUPON_POINTS_NOT_ENTERED' => "Bitte geben Sie eine Verg&uuml;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&auml;ge verkn&uuml;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&ouml;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&ouml;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&uuml;tig, Ihnen nicht zugewiesen, bereits abgelaufen, oder Sie haben ihn bereits eingel&ouml;st.",
+       'MEMBER_COUPON_CODE_ALREADY_CASHED' => "Der von Ihnen eingegebene Gutschein-Code ist entweder ung&uuml;tig, Ihnen nicht zugewiesen, bereits abgelaufen, oder Sie haben ihn bereits eingel&ouml;st.",
        'MEMBER_COUPON_CODE_CASHED' => "Ihr Gutschein im Wert von <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> wurde soeben eingel&ouml;st und Ihrem Konto gutgeschrieben.",
+       'MEMBER_COUPON_CASHED_404' => "Sie haben noch keinen Gutschein eingel&ouml;st oder es wurde noch keiner erstellt. Bitte pr&uuml;fen Sie Ihre Emails, ob Sie eventuell einen erhalten haben, den Sie noch einl&ouml;sen k&ouml;nnen.",
+       'MEMBER_LIST_CASHED_COUPONS_TITLE' => "Alle Ihre eingel&ouml;sten Gutscheine",
+       'MEMBER_LIST_CASHED_COUPONS_NOTE' => "Bitte beachten Sie, dass Gutscheine nach <span class=\"data\">{%config,createFancyTime=coupon_autopurge_time%}</span> 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&ouml;st",
+
+       // Language strings for admin/member
+       'COUPON_ID' => "Gutscheinnummer",
+       'COUPON_CASHED_ON' => "Eingel&ouml;st am",
+       'COUPON_CREATED_ON' => "Erstellt am",
+       'COUPON_EXPIRED_ON' => "Abgelaufen am",
+       'COUPON_TOTAL_CREATED' => "Erstellt",
+       'COUPON_TOTAL_CASHED' => "Eingel&ouml;st",
+       'COUPON_DESCRIPTION' => "Hinweistext",
 ));
 
 // [EOF]
index 520d11e..c9ac224 100644 (file)
@@ -311,7 +311,7 @@ addMessages(array(
        'MEMBER_MYDATA_MAIL_SENT' => "Es ist eine Email zu Ihnen unterwegs.",
        'ADMIN_CHANGED_DATA' => "Profildaten ge&auml;ndert",
        'ADMIN_MEMBER_CHANGED_PROFILE' => "Eines Ihrer Mitglieder hat seine Profildaten ge&auml;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&auml;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 <span class=\"data\">%s</span> erkannt.",
        'ACCOUNT_STATUS_UNCONFIRMED' => "<span class=\"status_unconfirmed\">Unbest&auml;tigt</span>",
@@ -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 <span class=\"data\">%s</span> 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.",
index 2e62574..89c2bc5 100644 (file)
@@ -58,7 +58,7 @@ addMessages(array(
        'TRANSFER_PLEASE_ALLOW_OPT_IN' => "Bitte erst Empfangen von &Uuml;berweisungen erlauben.",
        'TRANSFER_NOW_LINK' => "&Uuml;berweisung zum anderen Mitglied t&auml;tigen",
        'TRANSFER_NOW_TITLE' => "Starten Sie hier eine &Uuml;berweisung von {?POINTS?} an ein anderes Mitglied.",
-       'TRANSFER_SELECT_TARGET_UID' => "Empf&auml;nger ausw&auml;hlen",
+       'TRANSFER_SELECT_TARGET_USERID' => "Empf&auml;nger ausw&auml;hlen",
        'TRANSFER_NO_ONE_ELSE_OPT_IN' => "Niemand weiteres m&ouml;chte &Uuml;berweisungen empfangen.",
        'TRANSFER_POINTS_MAXIMUM' => "Maximaler Betrag",
        'TRANSFER_POINTS_AMOUNT' => "Zu &uuml;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&auml;nger",
+       'TRANSFER_FROM_USERID' => "Sender",
+       'TRANSFER_TO_USERID' => "Empf&auml;nger",
        'TRANSFER_TOTAL_SUM' => "Gesamt transferierte {?POINTS?}",
        'TRANSFER_DELETE' => "Eintr&auml;ge l&ouml;schen",
 ));
index 838c8db..4b4addc 100644 (file)
@@ -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--}'
index 91f3988..038086d 100644 (file)
@@ -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
index e88441e..859996d 100644 (file)
@@ -174,7 +174,7 @@ LIMIT 1",
                                                $content = getUserDataArray();
 
                                                // Generate HTML list entry
-                                               $add = '<li>{--ADMIN_MEMBER_UID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
+                                               $add = '<li>{--ADMIN_MEMBER_USERID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
                                        } 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 (file)
index 0000000..0069ce0
--- /dev/null
@@ -0,0 +1,90 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 06/29/2004 *
+ * ===================                          Last change: 06/29/2004 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_coupon.php                             *
+ * -------------------------------------------------------------------- *
+ * Short description : List all cashed coupons                          *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Alle eingeloesten Gutscheine auflisten           *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+// Check if the user has cashed coupons
+$result = SQL_QUERY('SELECT
+       u.`coupon_id`,
+       u.`userid`,
+       UNIX_TIMESTAMP(u.`cashed_on`) AS `cashed_on`,
+       UNIX_TIMESTAMP(d.`coupon_created`) AS `coupon_created`,
+       UNIX_TIMESTAMP(d.`coupon_expired`) AS `coupon_expired`,
+       d.`points`, d.`total_created`, d.`total_cashed`, d.`coupon_description`
+FROM
+       `{?_MYSQL_PREFIX?}_user_coupons` AS u
+INNER JOIN
+       `{?_MYSQL_PREFIX?}_coupon_data` AS d
+ON
+       u.`coupon_id`=d.`id`
+ORDER BY
+       u.`cashed_on` DESC', __FILE__, __LINE__);
+
+// Do we have entries?
+if (SQL_NUMROWS($result) > 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]
+?>
index 7dc84d0..06d0321 100644 (file)
@@ -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');
index 645231f..0d28088 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 28/06/2011 *
- * ===================                          Last change: 28/06/2011 *
+ * Mailer v0.2.1-FINAL                                Start: 06/28/2011 *
+ * ===================                          Last change: 06/28/2011 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : action-coupon.php                                *
index 48902d0..9afb697 100644 (file)
@@ -60,7 +60,7 @@ if ((isExtensionActive('nickname')) && (getUserData('nickname') != '')) {
        $content['userid'] = getMemberId();
 }
 
-// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
+// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 
 // Load template
 loadTemplate('member_beg', false, $content);
index 9028084..ae1938a 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 28/06/2011 *
- * ===================                          Last change: 28/06/2011 *
+ * Mailer v0.2.1-FINAL                                Start: 06/28/2011 *
+ * ===================                          Last change: 06/28/2011 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-cash_coupon.php                             *
@@ -62,7 +62,7 @@ if (isFormSent()) {
        UNIX_TIMESTAMP(d.`coupon_expired`) AS `coupon_expired`,
        d.`coupon_type`,
        d.`total_created`,
-       d.`total_used`,
+       d.`total_cashed`,
        d.`points`,
        d.`coupon_description`
 FROM
@@ -109,7 +109,7 @@ LIMIT 1",
                        } // END - if
 
                        // Update count as well
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_coupon_data` SET `total_used`=`total_used`+1 WHERE `id`=%s AND `total_used` < `total_created` LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_coupon_data` SET `total_cashed`=`total_cashed`+1 WHERE `id`=%s AND `total_cashed` < `total_created` LIMIT 1",
                                array(bigintval($content['coupon_id'])), __FILE__, __LINE__);
 
                        // Does it work?
@@ -138,7 +138,7 @@ LIMIT 1",
                        displayMessage(getMaskedMessage('MEMBER_COUPON_CODE_CASHED', $content['points']));
                } else {
                        // No coupon found
-                       displayMessage('{--MEMBER_COUPON_CODE_ALREADY_USED--}');
+                       displayMessage('{--MEMBER_COUPON_CODE_ALREADY_CASHED--}');
                }
 
                // Free the result
diff --git a/inc/modules/member/what-list_coupon.php b/inc/modules/member/what-list_coupon.php
new file mode 100644 (file)
index 0000000..cbba7c7
--- /dev/null
@@ -0,0 +1,100 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 06/29/2004 *
+ * ===================                          Last change: 06/29/2004 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_coupon.php                             *
+ * -------------------------------------------------------------------- *
+ * Short description : List all cashed coupons                          *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Alle eingeloesten Gutscheine auflisten           *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
+}
+
+// Add description as navigation point
+addYouAreHereLink('member', __FILE__);
+
+// Continue only if the proper extension is active (admins can always continue)
+if ((!isExtensionActive('coupon')) && (!isAdmin())) {
+       displayMessage(generateExtensionInactiveNotInstalledMessage('coupon'));
+       return;
+} // END - if
+
+// Check if the user has cashed coupons
+$result = SQL_QUERY_ESC("SELECT
+       UNIX_TIMESTAMP(u.`cashed_on`) AS `cashed_on`,
+       UNIX_TIMESTAMP(d.`coupon_created`) AS `coupon_created`,
+       UNIX_TIMESTAMP(d.`coupon_expired`) AS `coupon_expired`,
+       d.`points`, d.`total_created`, d.`total_cashed`, d.`coupon_description`
+FROM
+       `{?_MYSQL_PREFIX?}_user_coupons` AS u
+INNER JOIN
+       `{?_MYSQL_PREFIX?}_coupon_data` AS d
+ON
+       u.`coupon_id`=d.`id`
+WHERE
+       u.`userid`=%s AND
+       u.`coupon_code` IS NULL AND
+       u.`cashed_on` IS NOT NULL
+ORDER BY
+       u.`cashed_on` DESC", array(getMemberId()), __FILE__, __LINE__);
+
+// Do we have entries?
+if (SQL_NUMROWS($result) > 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]
+?>
index 66a356d..0b48f39 100644 (file)
@@ -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%}
index b7ef6a3..49e80b8 100644 (file)
@@ -32,7 +32,7 @@
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_CONFIG_BEG_UID_TIMEOUT--}:
+                       {--ADMIN_CONFIG_BEG_USERID_TIMEOUT--}:
                </td>
                <td align="center">
                        $content[userid_timeout]
index 8aa8aee..6a054ad 100644 (file)
@@ -7,7 +7,7 @@
        </td>
 </tr>
 <tr>
-       <td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_TEST_URL--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--ADMIN_SURFBAR_REGISTERED--}</strong></td>
 </tr>
index 023ced5..fac0758 100644 (file)
@@ -7,7 +7,7 @@
        </td>
 </tr>
 <tr>
-       <td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--ADMIN_TEST_URL--}</strong></td>
 </tr>
 $content
index c266e2f..bf62f4f 100644 (file)
@@ -6,7 +6,7 @@
        </td>
 </tr>
 <tr>
-       <td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--GENDER--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--SURNAME--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--FAMILY--}</strong></td>
index 3c1bdb2..6ad91d9 100644 (file)
@@ -10,7 +10,7 @@
                <strong>{--BEG_RANK--}</strong>
        </td>
        <td class="header_column bottom right" align="center">
-               <strong>{--_UID--}:</strong>
+               <strong>{--_USERID--}:</strong>
        </td>
        <td class="header_column bottom right" align="center">
                <strong>{--SURNAME_FAMILY--}:</strong>
index e10febf..4e54627 100644 (file)
@@ -10,7 +10,7 @@
                <strong>{--BONUS_RANK--}</strong>
        </td>
        <td class="header_column bottom right" align="center">
-               <strong>{--_UID--}:</strong>
+               <strong>{--_USERID--}:</strong>
        </td>
        <td class="header_column bottom right" align="center">
                <strong>{--SURNAME_FAMILY--}:</strong>
index a1f9376..39caff4 100644 (file)
@@ -6,13 +6,13 @@
                </td>
        </tr>
        <tr>
-               <td class="header_column right" align="center" width="20">{--_UID--}</td>
+               <td class="header_column right" align="center" width="20">{--_USERID--}</td>
                <td class="header_column right" align="center">{--GENDER--}</td>
                <td class="header_column right" align="center">{--SURNAME--}</td>
                <td class="header_column right" align="center">{--FAMILY--}</td>
                <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 right" align="center" width="20">{--REFERAL_USERID--}</td>
                <td class="header_column" align="center">{--ADMIN_CONFIRM_ACCOUNT--}</td>
        </tr>
        $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 (file)
index 0000000..f383293
--- /dev/null
@@ -0,0 +1,44 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+<tr>
+       <td colspan="9" class="table_header bottom" align="center">
+               <strong>{--ADMIN_LIST_CASHED_COUPONS_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_ID--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--_USERID--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{?POINTS?}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_CASHED_ON--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_CREATED_ON--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_EXPIRED_ON--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_TOTAL_CREATED--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_TOTAL_CASHED--}</strong>
+       </td>
+       <td align="center" class="header_column bottom">
+               <strong>{--COUPON_DESCRIPTION--}</strong>
+       </td>
+</tr>
+$content
+<tr>
+       <td colspan="9" class="table_footer" align="center">
+               <div class="tiny notice">{--ADMIN_LIST_CASHED_COUPONS_NOTE--}</div>
+       </td>
+</tr>
+</table>
+</div>
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 (file)
index 0000000..66b92ad
--- /dev/null
@@ -0,0 +1,29 @@
+<tr>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[coupon_id]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,generateUserProfileLink=$content[userid]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[points]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[cashed_on]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[coupon_created]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[coupon_expired]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[total_created]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[total_cashed]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               $content[coupon_description]
+       </td>
+</tr>
index 4b9b686..15d7591 100644 (file)
@@ -7,7 +7,7 @@
        </tr>
        <tr>
                <td class="header_column bottom right" align="center" height="25" width="25%">
-                       <div class="medium">{--_UID--}:</div>
+                       <div class="medium">{--_USERID--}:</div>
                </td>
                <td class="header_column bottom right" align="center" width="25%">
                        <div class="medium">{?POINTS?}:</div>
index a69921e..d964e2e 100644 (file)
@@ -6,7 +6,7 @@
                </td>
        </tr>
        <tr>
-               <td class="header_column bottom right" align="center" height="25" width="25%"><strong>{--_UID--}:</strong></td>
+               <td class="header_column bottom right" align="center" height="25" width="25%"><strong>{--_USERID--}:</strong></td>
                <td class="header_column bottom right" align="center" width="25%"><strong>{?POINTS?}:</strong></td>
                <td class="header_column bottom right" align="center" width="25%"><strong>{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:</strong></td>
                <td class="header_column bottom" align="center" width="25%"><strong class="medium">{--REMOTE_IP--}:</strong></td>
index 244096b..90d5f79 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td width="10" class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
-               <td width="50" class="header_column bottom right" align="center"><strong>{--_UID--}:</strong></td>
+               <td width="50" class="header_column bottom right" align="center"><strong>{--_USERID--}:</strong></td>
                <td width="80" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_TSTART--}:</strong></td>
                <td width="80" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_TEND--}:</strong></td>
                <td width="100" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_COMMENTS--}:</strong></td>
index 2562746..b4c08ed 100644 (file)
@@ -7,7 +7,7 @@
 </tr>
 <tr>
        <td align="center" width="5%" class="header_column bottom right"><strong>{--ID_SELECT--}</strong></td>
-       <td align="center" width="10%" class="header_column bottom right"><strong>{--_UID--}:</strong></td>
+       <td align="center" width="10%" class="header_column bottom right"><strong>{--_USERID--}:</strong></td>
        <td align="center" width="10%" class="header_column bottom right"><strong>{--REMOTE_IP--}:</strong></td>
        <td align="center" width="5%" class="header_column bottom right"><strong>{--_REFID--}:</strong></td>
        <td align="center" width="10%" class="header_column bottom right"><strong>{--_MODULE--}:</strong></td>
index 9c61878..a50ed14 100644 (file)
@@ -6,7 +6,7 @@
                </td>
        </tr>
        <tr>
-               <td width="20" align="center" class="header_column bottom right"><strong>{--_UID--}</strong></td>
+               <td width="20" align="center" class="header_column bottom right"><strong>{--_USERID--}</strong></td>
                <td width="40" align="center" class="header_column bottom right"><strong>{--PAYOUT_TOTAL_PAYOUT--}</strong></td>
                <td width="80" align="center" class="header_column bottom right"><strong>{--MEMBER_PAYOUT_TARGET_ACCOUNT2--}</strong></td>
                <td width="80" align="center" class="header_column bottom right"><strong>{--MEMBER_PAYOUT_TARGET_BANK2--}</strong></td>
index 3126600..17f5ae6 100644 (file)
@@ -7,7 +7,7 @@
 </tr>
 <tr>
        <td class="header_column bottom right" align="center" width="60"><strong>{--ID_SELECT--}</strong></td>
-       <td class="header_column bottom right" align="center" width="90"><strong>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center" width="90"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_PRIMERA_ACCOUNT--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_PRIMERA_TRANSFERED--}</strong></td>
        <td class="header_column bottom right" align="center" width="160"><strong>{--ADMIN_PRIMERA_TIMESTAMP--}</strong></td>
index 61bd4b8..78183e0 100644 (file)
@@ -6,7 +6,7 @@
        </td>
 </tr>
 <tr>
-       <td align="center" class="header_column bottom right"><strong>{--_UID--}:</strong></td>
+       <td align="center" class="header_column bottom right"><strong>{--_USERID--}:</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--RALLYE_OLD_REFS--}:</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--RALLYE_NEW_REFS--}:</strong></td>
        <td align="center" class="header_column bottom"><strong>{--RALLYE_REFERAL_POINTS--}:</strong></td>
index 947fd18..fa2ed98 100644 (file)
@@ -6,7 +6,7 @@
        </td>
 </tr>
 <tr>
-       <td width="5%" align="center" class="header_column bottom right"><strong>{--_UID--}</strong></td>
+       <td width="5%" align="center" class="header_column bottom right"><strong>{--_USERID--}</strong></td>
        <td width="5%" align="center" class="header_column bottom right"><strong>{--REFS_COUNT--}</strong></td>
        <td width="35%" align="center" class="header_column bottom right"><strong>{--SURNAME_FAMILY--}</strong></td>
        <td width="35%" align="center" class="header_column bottom right"><strong>{--EMAIL--}</strong></td>
index dd97103..1ce28a9 100644 (file)
@@ -8,7 +8,7 @@
        </td>
 </tr>
 <tr>
-       <td width="5%" align="center" class="header_column bottom right"><strong>{--_UID--}</strong></td>
+       <td width="5%" align="center" class="header_column bottom right"><strong>{--_USERID--}</strong></td>
        <td width="5%" align="center" class="header_column bottom right"><strong>{--REFS_COUNT--}</strong></td>
        <td width="35%" align="center" class="header_column bottom right"><strong>{--SURNAME_FAMILY--}</strong></td>
        <td width="35%" align="center" class="header_column bottom right"><strong>{--EMAIL--}</strong></td>
index ac72dae..1b80e70 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>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_TEST_URL--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_SURFBAR_VIEWS_TOTAL--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_SURFBAR_STATUS--}</strong></td>
index 5a3901b..4ec5340 100644 (file)
@@ -11,7 +11,7 @@
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_ASSIGNED_ADMIN--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_REGISTER_EXTENSION--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_TASK_INFOS--}</strong></td>
-       <td align="center" class="header_column bottom right"><strong>{--ADMIN_MEMBER_UID--}</strong></td>
+       <td align="center" class="header_column bottom right"><strong>{--ADMIN_MEMBER_USERID--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_TASK_TYPE--}</strong></td>
        <td align="center" class="header_column bottom"><strong>{--ADMIN_TASK_CREATED--}</strong></td>
 </tr>
index 36a8275..bada729 100644 (file)
@@ -11,7 +11,7 @@
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_ASSIGNED_ADMIN--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_REGISTER_EXTENSION--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_TASK_INFOS--}</strong></td>
-       <td align="center" class="header_column bottom right"><strong>{--ADMIN_MEMBER_UID--}</strong></td>
+       <td align="center" class="header_column bottom right"><strong>{--ADMIN_MEMBER_USERID--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_TASK_TYPE--}</strong></td>
        <td align="center" class="header_column bottom"><strong>{--ADMIN_TASK_CREATED--}</strong></td>
 </tr>
index 372aee8..b354570 100644 (file)
                        <strong>{--TRANSFER_STAMP--}</strong>
                </td>
                <td width="120" align="center" class="header_column bottom right">
-                       <strong>{--TRANSFER_FROM_UID--}</strong>
+                       <strong>{--TRANSFER_FROM_USERID--}</strong>
                </td>
                <td width="120" align="center" class="header_column bottom right">
-                       <strong>{--TRANSFER_TO_UID--}</strong>
+                       <strong>{--TRANSFER_TO_USERID--}</strong>
                </td>
                <td width="230" align="center" class="header_column bottom right">
                        <strong>{--TRANSFER_POINTS_REASON--}</strong>
index 571662d..393cdcb 100644 (file)
@@ -1,5 +1,5 @@
 <tr>
-       <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--_UID--}:</strong></td>
+       <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--_USERID--}:</strong></td>
        <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--GENDER--}:</strong></td>
        <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--SURNAME--}:</strong></td>
        <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--FAMILY--}:</strong></td>
@@ -15,7 +15,7 @@
 <tr>
        <td align="center" class="right {%template,ColorSwitch%}"><strong>{--EMAIL--}:</strong></td>
        <td align="center" class="right {%template,ColorSwitch%}"><strong>{--REMOTE_IP--}:</strong></td>
-       <td align="center" class="right {%template,ColorSwitch%}"><strong>{--REFERAL_UID--}:</strong></td>
+       <td align="center" class="right {%template,ColorSwitch%}"><strong>{--REFERAL_USERID--}:</strong></td>
        <td align="center" class="right {%template,ColorSwitch%}"><strong>{--ACCOUNT_STATUS--}:</strong></td>
        <td align="center" class="{%template,ColorSwitch%}"><strong>{--UNCONFIRMED_LINKS--}:</strong></td>
 </tr>
index 12fc3ef..d71db91 100644 (file)
@@ -7,7 +7,7 @@
 </tr>
 <tr>
        <td class="header_column bottom right" align="center" width="60"><strong>{--ID_SELECT--}</strong></td>
-       <td class="header_column bottom right" align="center" width="90"><strong>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center" width="90"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_WERNIS_WDS66_ACCOUNT--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_WERNIS_TRANSFERED--}</strong></td>
        <td class="header_column bottom right" align="center" width="160"><strong>{--ADMIN_WERNIS_TIMESTAMP--}</strong></td>
index aefdd5c..0a9b836 100644 (file)
@@ -7,7 +7,7 @@
        </td>
 </tr>
 <tr>
-       <td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_TEST_URL--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_SURFBAR_STATUS--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_SURFBAR_REGISTERED--}</strong></td>
index aa1c368..f4a3297 100644 (file)
@@ -11,7 +11,7 @@
        <td align="center" class="top bottom right header_column"><strong>{--ADMIN_ASSIGNED_ADMIN--}</strong></td>
        <td align="center" class="top bottom right header_column"><strong>{--ADMIN_REGISTER_EXTENSION--}</strong></td>
        <td align="center" class="top bottom right header_column"><strong>{--ADMIN_TASK_INFOS--}</strong></td>
-       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_MEMBER_UID--}</strong></td>
+       <td align="center" class="top bottom right header_column"><strong>{--ADMIN_MEMBER_USERID--}</strong></td>
        <td align="center" class="top bottom right header_column"><strong>{--ADMIN_TASK_TYPE--}</strong></td>
        <td align="center" class="top bottom right header_column"><strong>{--ADMIN_TASK_CREATED--}</strong></td>
 </tr>
index 5b7fdea..ce8bcad 100644 (file)
@@ -7,7 +7,7 @@
 </tr>
 <tr>
        <td align="center" width="33%" class="header_column bottom right">
-               <strong>{--_UID--}:</strong>
+               <strong>{--_USERID--}:</strong>
        </td>
        <td align="center" width="34%" class="header_column bottom right">
                <strong>{--ADMIN_SURFBAR_VISITED_URLS--}:</strong>
index 0cc11ba..ddccfdd 100644 (file)
@@ -7,7 +7,7 @@
 </tr>
 <tr>
        <td align="center" width="33%" class="header_column bottom right">
-               <strong>{--_UID--}:</strong>
+               <strong>{--_USERID--}:</strong>
        </td>
        <td align="center" width="34%" class="header_column bottom right">
                <strong>{--ADMIN_SURFBAR_TOTAL_VISITS--}:</strong>
index 91fcf71..b46c682 100644 (file)
@@ -7,7 +7,7 @@
        </td>
 </tr>
 <tr>
-       <td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_TEST_URL--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_SURFBAR_STATUS--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--ADMIN_SURFBAR_REGISTERED--}</strong></td>
index 7fcd2d0..7f73eef 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>{--_UID--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_SURFBAR_URL--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--ADMIN_TEST_URL--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--ADMIN_SURFBAR_REGISTERED--}</strong></td>
index d2a5d01..d072535 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" align="center" class="table dashed">
        <tr>
                <td colspan="4" class="table_header" align="center" style="height: 30px">
-                       <strong class="big">{--_UID--} $content[userid]</strong>
+                       <strong class="big">{--_USERID--} $content[userid]</strong>
                </td>
        </tr>
        <tr>
@@ -61,7 +61,7 @@
        </tr>
        <tr>
                <td align="center" class="top right">
-                       {--REFERAL_UID--}:<br />
+                       {--REFERAL_USERID--}:<br />
                        <strong>$content[refid]</strong>
                </td>
                <td align="center" class="top right">
index e148b3f..53937ba 100644 (file)
@@ -1,5 +1,5 @@
 <div>
-       {--BEG_UID_STEAL_1--}<strong>$content[userid]</strong>{--BEG_UID_STEAL_2--}<strong>{%pipe,translateComma=$content[points]%}</strong>{--BEG_UID_STEAL_3--}
+       {--BEG_USERID_STEAL_1--}<strong>$content[userid]</strong>{--BEG_USERID_STEAL_2--}<strong>{%pipe,translateComma=$content[points]%}</strong>{--BEG_USERID_STEAL_3--}
 </div>
 
 <div>
index caccb16..7d6a92e 100644 (file)
@@ -7,7 +7,7 @@
        </tr>
        <tr>
                <td class="header_column bottom right">
-                       <strong>{--_UID--}:</strong>
+                       <strong>{--_USERID--}:</strong>
                </td>
                <td class="header_column bottom right">
                        <strong>{--TOTAL_POINTS--}:</strong>
index d54fd1b..90d3449 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="doubler_list dashed">
        <tr>
                <td class="doubler_header bottom right" align="center" width="100">
-                       <strong>{--_UID--}</strong>
+                       <strong>{--_USERID--}</strong>
                </td>
                <td class="doubler_header bottom right" align="center" width="160">
                        <strong>{?POINTS?}</strong>
index 09548ab..2650ca0 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" width="430" class="table dashed">
 <tr>
        <td align="center" class="header_column bottom" width="80" height="25"><strong>{--_RALLYE_PRICE--}</strong></td>
-       <td align="center" class="header_column bottom" width="50"><strong>{--_UID--}</strong></td>
+       <td align="center" class="header_column bottom" width="50"><strong>{--_USERID--}</strong></td>
        <td align="center" class="header_column bottom" width="300"><strong>{--RALLYE_GUEST_REFS--}</strong></td>
 </tr>
 $content[rows]
index 07e31b2..4441569 100644 (file)
@@ -11,7 +11,7 @@
                        <strong>Platz:</strong>
                </td>
                <td class="header_column bottom right">
-                       <strong>{--_UID--}:</strong>
+                       <strong>{--_USERID--}:</strong>
                </td>
                <td class="header_column bottom right">
                        <strong>{--TOTAL_LOGINS--}:</strong>
@@ -47,7 +47,7 @@
                        <strong>Platz:</strong>
                </td>
                <td class="header_column bottom right">
-                       <strong>{--_UID--}:</strong>
+                       <strong>{--_USERID--}:</strong>
                </td>
                <td class="header_column bottom right">
                        <strong>{--TOTAL_POINTS--}:</strong>
@@ -80,7 +80,7 @@
                        <strong>Platz:</strong>
                </td>
                <td class="header_column bottom right">
-                       <strong>{--_UID--}:</strong>
+                       <strong>{--_USERID--}:</strong>
                </td>
                <td class="header_column bottom right">
                        <strong>{--TOTAL_REFERALS--}:</strong>
index 5de0ccb..0625f10 100644 (file)
@@ -8,7 +8,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td width="80" align="center" class="header_column bottom"><strong>{--BONUS_RANK--}:</strong></td>
-               <td width="120" align="center" class="header_column bottom"><strong>{--_UID--}:</strong></td>
+               <td width="120" align="center" class="header_column bottom"><strong>{--_USERID--}:</strong></td>
 
                <td width="100" align="center" class="header_column bottom"><strong>{?POINTS?}:</strong></td>
                <td width="220" align="center" class="header_column bottom"><strong>{--LAST_ONLINE_SHORT--}:</strong></td>
index 45d6145..b0586dc 100644 (file)
@@ -1,10 +1,10 @@
 <table border="0" cellspacing="0" cellpadding="0" class="doubler_list dashed">
        <tr>
                <td class="doubler_header bottom right" align="center" width="100">
-                       <strong>{--_UID--}</strong>
+                       <strong>{--_USERID--}</strong>
                </td>
                <td class="doubler_header bottom right" align="center" width="100">
-                       <strong>{--REFERAL_UID--}</strong>
+                       <strong>{--REFERAL_USERID--}</strong>
                </td>
                <td class="doubler_header bottom right" align="center" width="160">
                        <strong>{?POINTS?}</strong>
index bc60da3..9ffa049 100644 (file)
@@ -1,14 +1,14 @@
 <div align="center">
 <div class="table dashed">
 <div class="table_header">
-       <strong>{--MEMBER_BEG_HERE_IS_THE_LIST--}</strong>
+       <strong>{--MEMBER_LIST_BEG_RALLYE_TITLE--}</strong>
 </div>
 </div>
 
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td width="80" align="center" class="header_column bottom"><strong>{--BEG_RANK--}:</strong></td>
-               <td width="120" align="center" class="header_column bottom"><strong>{--_UID--}:</strong></td>
+               <td width="120" align="center" class="header_column bottom"><strong>{--_USERID--}:</strong></td>
                <td width="100" align="center" class="header_column bottom"><strong>{--BEG_POINTS--}:</strong></td>
                <td width="220" align="center" class="header_column bottom"><strong>{--LAST_ONLINE_SHORT--}:</strong></td>
        </tr>
index 6075586..fc6c2c0 100644 (file)
@@ -1,6 +1,14 @@
 <tr>
-       <td align="center" class="{%template,ColorSwitch%} bottom">$content[cnt]</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">$content[userid]</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">{%pipe,translateComma=$content[beg_points]%}</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">$content[last_online]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               $content[cnt]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               $content[userid]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               {%pipe,translateComma=$content[beg_points]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               $content[last_online]
+       </td>
 </tr>
diff --git a/templates/de/html/member/member_list_coupon.tpl b/templates/de/html/member/member_list_coupon.tpl
new file mode 100644 (file)
index 0000000..de3e224
--- /dev/null
@@ -0,0 +1,38 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+<tr>
+       <td colspan="7" class="table_header bottom" align="center">
+               <strong>{--MEMBER_LIST_CASHED_COUPONS_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td align="center" class="header_column bottom right">
+               <strong>{?POINTS?}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_CASHED_ON--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_CREATED_ON--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_EXPIRED_ON--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_TOTAL_CREATED--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--COUPON_TOTAL_CASHED--}</strong>
+       </td>
+       <td align="center" class="header_column bottom">
+               <strong>{--COUPON_DESCRIPTION--}</strong>
+       </td>
+</tr>
+$content
+<tr>
+       <td colspan="7" class="table_footer" align="center">
+               <div class="tiny notice">{--MEMBER_LIST_CASHED_COUPONS_NOTE--}</div>
+       </td>
+</tr>
+</table>
+</div>
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 (file)
index 0000000..ebdb625
--- /dev/null
@@ -0,0 +1,23 @@
+<tr>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[points]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[cashed_on]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[coupon_created]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[coupon_expired]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[total_created]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[total_cashed]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               $content[coupon_description]
+       </td>
+</tr>
index efc01c0..6062fc8 100644 (file)
@@ -8,7 +8,7 @@
 </tr>
 <tr>
        <td align="center" class="header_column bottom right">
-               <strong>{--_UID--}</strong>
+               <strong>{--_USERID--}</strong>
        </td>
        <td align="center" class="header_column bottom right">
                <strong>{--ACCOUNT_STATUS--}</strong>
index 42569b6..8a2f89d 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="right" class="bottom" height="40"><strong>
-                       {--TRANSFER_SELECT_TARGET_UID--}:</strong>
+                       {--TRANSFER_SELECT_TARGET_USERID--}:</strong>
                </td>
                <td align="center" class="bottom">
                        $content[userid_selection]
index d312c9a..d5953d6 100644 (file)
@@ -7,7 +7,7 @@
 <table border="0" cellspacing="0" cellpadding="0" width="300" class="table dashed">
        <tr>
                <td width="80" align="center" class="header_column bottom"><strong>{--BONUS_RANK--}:</strong></td>
-               <td width="120" align="center" class="header_column bottom"><strong>{--_UID--}:</strong></td>
+               <td width="120" align="center" class="header_column bottom"><strong>{--_USERID--}:</strong></td>
                <td width="100" align="center" class="header_column bottom"><strong>{?POINTS?}:</strong></td>
        </tr>
        $content[rows]