From a49d1f4613f3f7d47fb57d946e9f7f705bd34a9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 4 Nov 2009 05:17:05 +0000 Subject: [PATCH] Typo 'referral'->'referal' fixed, more 'empty version' fixed --- inc/functions.php | 2 +- inc/gen_refback.php | 4 ++-- inc/language/de.php | 22 +++++++++---------- inc/language/doubler_de.php | 20 ++++++++--------- inc/language/sponsor_de.php | 4 ++-- inc/modules/admin/what-list_refs.php | 2 +- inc/modules/admin/what-list_user.php | 2 +- inc/modules/admin/what-unlock_sponsor.php | 14 ++++++------ inc/modules/guest/what-confirm.php | 20 +++++++++++++---- inc/mysql-manager.php | 8 ++++--- inc/wrapper-functions.php | 5 ++++- .../de/html/admin/admin_config_doubler.tpl | 2 +- templates/de/html/admin/admin_list_refs.tpl | 4 ++-- templates/de/html/admin/admin_list_refs2.tpl | 4 ++-- .../de/html/admin/admin_list_refs_level.tpl | 2 +- .../html/admin/admin_list_sponsor_details.tpl | 2 +- .../de/html/admin/admin_list_user_row.tpl | 2 +- .../de/html/admin/admin_user_details.tpl | 2 +- templates/de/html/doubler/doubler_index.tpl | 12 +++++----- templates/de/html/guest/guest_doubler.tpl | 6 ++--- templates/de/html/guest/guest_sponsor_reg.tpl | 2 +- templates/de/html/guest/guest_top10.tpl | 2 +- templates/de/html/member/member_doubler.tpl | 16 +++++++------- templates/de/html/member/member_points.tpl | 2 +- 24 files changed, 89 insertions(+), 72 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 8d4cc44e90..7b691f4bfe 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2919,7 +2919,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) { } // Send notification to admin function sendAdminNotification ($subject, $templateName, $content=array(), $userid = 0) { - if (getExtensionVersion('admins') >= '0.4.1') { + if (isExtensionInstalledAndNewer('admins', '0.4.1')) { // Send new way sendAdminsEmails($subject, $templateName, $content, $userid); } else { diff --git a/inc/gen_refback.php b/inc/gen_refback.php index 7d0a6b7d7b..77fd532d80 100644 --- a/inc/gen_refback.php +++ b/inc/gen_refback.php @@ -45,13 +45,13 @@ if (!defined('__SECURITY')) { loadIncludeOnce('inc/libs/refback_functions.php'); // Sanity-check: Do we have ref level 0? -$result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE level=0", __FILE__, __LINE__); +$result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE `level`=0", __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Remove index temporaly SQL_ALTER_TABLE("ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` DROP INDEX `userid_level`", __FILE__, __LINE__); // Upgrade refsystem, ref-level 0 is silly here - SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET level=level+1", __FILE__, __LINE__); + SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `level`=`level`+1", __FILE__, __LINE__); // Add it again SQL_ALTER_TABLE("ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` ADD UNIQUE `userid_level` ( `userid`,`level` )", __FILE__, __LINE__); diff --git a/inc/language/de.php b/inc/language/de.php index 7035eb773f..47235da07c 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -347,8 +347,8 @@ addMessages(array( 'YOUR_PERSONAL_REFLINK' => "Ihr persönlicher Ref-Link zum Werben neuer Mitglieder lautet", 'YOUR_REFCLICKS' => "Klicks auf Ihren Referal-Link", 'CLICKS' => "Klicks", - 'YOU_REFERRAL_ONE' => "Sie haben heute ein neues Mitglied für unseren {?mt_word?} geworben!\n\nHier sehen Sie genau, in welcher Ebene Sie ihn geworben haben:", - 'YOU_THANX_REFERRAL' => "Sie werden nun auch weiterhin {?POINTS?} über diese geworbene Person erhalten.\n\nVielen Dank für Ihr Mitwerben! Wir wünschen Ihnen noch weiterhin viele neue Referals!\n\nMit freundlichen Grüßen,", + 'YOU_REFERAL_ONE' => "Sie haben heute ein neues Mitglied für unseren {?mt_word?} geworben!\n\nHier sehen Sie genau, in welcher Ebene Sie ihn geworben haben:", + 'YOU_THANX_REFERAL' => "Sie werden nun auch weiterhin {?POINTS?} über diese geworbene Person erhalten.\n\nVielen Dank für Ihr Mitwerben! Wir wünschen Ihnen noch weiterhin viele neue Referals!\n\nMit freundlichen Grüßen,", 'POINTS_REF_REGISTER' => "Referal-Pauschale und prozentual vom Anmeldebonus.", 'NO_REFLEVEL_LEFT' => "Keine Referal-Ebenen mehr verfügbar! Bitte melden Sie sich bei uns.", 'ENGINE' => "{?mt_word?}-Engine", @@ -505,7 +505,7 @@ addMessages(array( 'MAILS_SENT' => "Mails versendet", 'HAS_JOINED' => "Beigetreten am", 'TOTAL_POINTS' => "{?POINTS?} gesamt", - 'TOTAL_REFERRALS' => "Referals gesamt", + 'TOTAL_REFERALS' => "Referals gesamt", 'ADMIN_MEMBER_FUNCTIONS' => "Administrative Funktionen", 'ADMIN_DEL_USER' => "Löschen", 'ADMIN_LOCK_USER' => "Sperren", @@ -533,7 +533,7 @@ addMessages(array( 'GUEST_CONFIRM_SUBJ' => "Bitte Ihre Email-Adresse bestätigen.", 'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet", 'MEMBER_ORDER_REJECTED' => "Ihre Mailbuchung wurde abgelehnt", - 'THANX_REFERRAL_ONE' => "Vielen Dank für die Referal-Werbung.", + 'THANX_REFERAL_ONE' => "Vielen Dank für die Referal-Werbung.", 'ADMIN_SEND_MAIL' => "Bonusmail versenden", 'ADMIN_BONUS_SEND' => "Bonusmail wurde in den Sende-Pool eingefügt.", 'ENTER_POINTS' => "Vergütung", @@ -604,7 +604,7 @@ addMessages(array( 'PAYMENT_ID' => "Vergütungs-Id", 'CHANGE_PAY' => "Ändern", 'REMOVE_PAY' => "Löschen", - 'REFERRALS' => "Referals", + 'REFERALS' => "Referals", 'POINTS_SUM' => "Gesamtsumme", 'NEW_VERSION_AVAILABLE' => "Neue Version verfügbar.", 'YOUR_VERSION_IS' => "Installierte Version", @@ -968,11 +968,11 @@ addMessages(array( 'ADMIN_ENTER_ALTERNATE_TEXT' => "Alternativen Text", 'ADMIN_SELECT_BANNER_ACTIVE' => "Ist der Banner aktiv?", 'ADMIN_SUBMIT_BANNER' => "Banner hinzufügen", - 'ADMIN_LIST_REFERRALS_1' => "Referal-Übersicht des Mitgliedes ", - 'ADMIN_LIST_REFERRALS_2' => " in allen Ebenen:", - 'ADMIN_LIST_REFERRALS_LEVEL_1' => "Referals in Ebene ", - 'ADMIN_LIST_REFERRALS_LEVEL_2' => ":", - 'ADMIN_LIST_REFERRALS_NOTE' => "Änderung: Klicken Sie die Mitglieder-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.", + 'ADMIN_LIST_REFERALS_1' => "Referal-Übersicht des Mitgliedes ", + 'ADMIN_LIST_REFERALS_2' => " in allen Ebenen:", + 'ADMIN_LIST_REFERALS_LEVEL_1' => "Referals in Ebene ", + 'ADMIN_LIST_REFERALS_LEVEL_2' => ":", + 'ADMIN_LIST_REFERALS_NOTE' => "Änderung: Klicken Sie die Mitglieder-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.", 'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gelöscht.", 'INITIAL_RELEASE' => "Erste Alpha-Version", 'NO_UPDATE_NOTES' => "Keine Update-Hinweise gefunden.", @@ -1166,7 +1166,7 @@ addMessages(array( // Special user lists (what=list_user) 'ADMIN_LIST_STATUS_LOCKED_ACCOUNTS' => "Alle gesperrten Mitglieder-Accounts auflisten", 'ADMIN_LIST_STATUS_CONFIRMED_ACCOUNTS' => "Alle bestätigten Mitglieder-Accounts auflisten", - 'ADMIN_LIST_MODE_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referrals auflisten", + 'ADMIN_LIST_MODE_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referals auflisten", // Admin task lines 'ADMIN_TASK_IS_MEMBER_SUPPORT' => "Support-Anfrage eines Mitgliedes", diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php index e06060ea96..39fa31e2ed 100644 --- a/inc/language/doubler_de.php +++ b/inc/language/doubler_de.php @@ -55,7 +55,7 @@ addMessages(array( 'ADMIN_DOUBLER_DISPLAY_NEW' => "Anzahl ersten X neuen Einträge", 'ADMIN_DOUBLER_DISPLAY_PAY' => "Anzahl ersten X vor Auszahlung stehender Verdoppelungen", 'ADMIN_DOUBLER_DISPLAY_OLD' => "Anzahl ersten X bereits ausgezahlter Verdoppelungen", - 'ADMIN_DOUBLER_REFERRAL' => "Prozentuale Referal-Vergütung", + 'ADMIN_DOUBLER_REFERAL' => "Prozentuale Referal-Vergütung", 'ADMIN_DOUBLER_MINIMUM' => "Minimum {?POINTS?} die verdoppelt werden sollen", 'ADMIN_DOUBLER_MAXIMUM' => "Maximum {?POINTS?} die verdoppelt werden sollen", 'ADMIN_DOUBLER_LEFT' => "Auf dem Mitgliedsaccount nach Verdoppelung Minimum-{?POINTS?}-Guthaben", @@ -96,17 +96,17 @@ addMessages(array( 'DOUBLER_EXAMPLE_2' => "Auszahlung:", 'DOUBLER_EXAMPLE_3' => ", sobald Sie an der Reihe sind, ohne(*) ein Risiko einzugehen.", 'DOUBLER_FULL_PAYOUT' => "100% Auszahlung", - 'DOUBLER_REFERRAL_1' => "Refverdienst: Es gibt", - 'DOUBLER_REFERRAL_2' => "Refverdienst. Wenn Sie {?POINTS?} auf dem Refkonto durch Werbung erwirtschaftet haben,", - 'DOUBLER_REFERRAL_3' => "(Wichtig! Maximal Verdoppelung darf nicht überschritten werden)", - 'DOUBLER_REFERRAL_4' => "werden diese bei Ihrer nächsten Verdoppelung aufgeschlagen.", - 'DOUBLER_REFERRAL_5' => "Beispiel: Sie haben", - 'DOUBLER_REFERRAL_6' => "Refverdienst und verdoppeln", - 'DOUBLER_REFERRAL_7' => ", Sie bekommen - sobald Sie an der Reihe sind -", - 'DOUBLER_REFERRAL_8' => "zurück.", + 'DOUBLER_REFERAL_1' => "Refverdienst: Es gibt", + 'DOUBLER_REFERAL_2' => "Refverdienst. Wenn Sie {?POINTS?} auf dem Refkonto durch Werbung erwirtschaftet haben,", + 'DOUBLER_REFERAL_3' => "(Wichtig! Maximal Verdoppelung darf nicht überschritten werden)", + 'DOUBLER_REFERAL_4' => "werden diese bei Ihrer nächsten Verdoppelung aufgeschlagen.", + 'DOUBLER_REFERAL_5' => "Beispiel: Sie haben", + 'DOUBLER_REFERAL_6' => "Refverdienst und verdoppeln", + 'DOUBLER_REFERAL_7' => ", Sie bekommen - sobald Sie an der Reihe sind -", + 'DOUBLER_REFERAL_8' => "zurück.", 'DOUBLER_TIMEOUT_1' => "Es werden Einträge nicht älter als", 'DOUBLER_TIMEOUT_2' => "angezeigt.", - 'DOUBLER_REFERRAL_LINK' => "Den Reflink erfahren Sie nach jeder Verdoppelung.", + 'DOUBLER_REFERAL_LINK' => "Den Reflink erfahren Sie nach jeder Verdoppelung.", 'DOUBLER_NOT_YET_REGISTERED' => "Noch nicht angemeldet?", 'DOUBLER_REGISTER_NOW' => "Weiter zur Anmeldung.", 'DOUBLER_YOUR_ADVERTISING_HERE' => "Hier könnte auch Ihre Werbung stehen:", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index cc50f67aa4..35937c6005 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -102,7 +102,7 @@ addMessages(array( 'ADMIN_SPONSOR_ACTIONS' => "Aktionen am Sponsorenaccount", 'SPONSOR_ID' => "Sponsor-Id", 'SPONSOR_STATUS' => "Sponsor-Status", - 'SPONSOR_REFERRALS' => "Sponsoren geworben", + 'SPONSOR_REFERALS' => "Sponsoren geworben", 'ADMIN_SPONSOR_INVALID_MODE' => "Ungütiger Modus %s angegeben.", 'ADMIN_SPONSOR_MODUS_TPL_404' => "Modus-Template %s nicht gefunden.", 'ADMIN_ADD_POINTS_TO_SPONSOR' => "{?POINTS?} gutschreiben", @@ -165,7 +165,7 @@ addMessages(array( 'SPONSOR_PAY_ENTRIES_REMOVED' => "Buchungspakete gelöscht.", 'SPONSOR_PAYMENT_LIST_IS_EMPTY' => "Noch keine Buchungspakete eingerichtet.", 'ADMIN_SPONSOR_UNKNOWN_STATUS' => "Unbekannter Status %s wurde bei der Anmeldung zurückgeliefert.", - 'SPONSOR_REFERRAL' => "Sponsoren-Referal", + 'SPONSOR_REFERAL' => "Sponsoren-Referal", 'SPONSOR_REFID_WAS' => "Sie wurden vom Sponsor geworben", 'SPONSOR_ACCOUNT_IS_PENDING' => "EMail-Adresse bestätigt! Sie haben soeben eine EMail mit weiteren Anweisungen erhalten.", diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php index 6a1085f167..7f23f8b881 100644 --- a/inc/modules/admin/what-list_refs.php +++ b/inc/modules/admin/what-list_refs.php @@ -103,7 +103,7 @@ ORDER BY // Is the data there? if (fetchUserData($content['refid'])) { // Check for referals - $refs_cnt = countSumTotalData(getUserData('userid'), 'refsystem', 'counter'); + $refs_cnt = countSumTotalData(getUserData('userid'), 'user_refs', 'id', 'userid', true); // Prepare data for the template $content = array( diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 48c1c15878..53bfce2af9 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -328,7 +328,7 @@ LIMIT 1", $content['locked'] = translateComma(countSumTotalData($content['userid'], 'user_points', 'locked_points')); $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); $content['status'] = translateUserStatus($content['status']); - $content['refs'] = countSumTotalData($content['userid'], 'refsystem', 'counter'); + $content['refs'] = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true); // If we have at least one referal, make it clickable to referal list if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '">' . $content['refs'] . ']'; diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index a3e1eeb870..bd1f77f506 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -136,18 +136,18 @@ LIMIT 1", FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`='%s' LIMIT 1", array(bigintval($content['refid'])), __FILE__, __LINE__); - $REFERRAL = SQL_FETCHARRAY($result); + $REFERAL = SQL_FETCHARRAY($result); // Send warnings out? - if ($REFERRAL['receive_warnings'] == 'Y') { + if ($REFERAL['receive_warnings'] == 'Y') { // Translate some data - $REFERRAL['points'] = translateComma($REFERRAL['points']); - $REFERRAL['ref_points'] = translateComma(getConfig('sponsor_ref_points')); - $REFERRAL['gender'] = translateGender($REFERRAL['gender']); + $REFERAL['points'] = translateComma($REFERAL['points']); + $REFERAL['ref_points'] = translateComma(getConfig('sponsor_ref_points')); + $REFERAL['gender'] = translateGender($REFERAL['gender']); // Send notification to referal - $REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERRAL); - sendEmail($REFERRAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG); + $REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL); + sendEmail($REFERAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG); } // Free memory diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php index 9f5fa62f35..f6fbe74847 100644 --- a/inc/modules/guest/what-confirm.php +++ b/inc/modules/guest/what-confirm.php @@ -55,17 +55,29 @@ if (isGetRequestElementSet('hash')) { $userid = 0; // Search for an unconfirmed or confirmed account - $result = SQL_QUERY_ESC("SELECT `userid`, `email`, `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `userid`, `email`, `refid`,`gender` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1", array(getRequestElement('hash')), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Ok, he want's to confirm now so we load some data - list($userid, $email, $rid) = SQL_FETCHROW($result); + list($userid, $email, $rid, $gender) = SQL_FETCHROW($result); + + // Fetch user data + if (!fetchUserData($userid)) { + // Not found, should not happen + debug_report_bug('User account ' . $userid . ' not found.'); + } // END - if + + // Load all data and add points + $content = getUserDataArray(); + $content['gender'] = translateGender($content['gender']); + $content['points'] = getConfig('points_register'); // Unlock his account (but only when it is on UNCONFIRMED!) SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='CONFIRMED', ref_payout={?ref_payout?}, `user_hash`=NULL WHERE `user_hash`='%s' AND `status`='UNCONFIRMED' LIMIT 1", array(getRequestElement('hash')), __FILE__, __LINE__); if (SQL_AFFECTEDROWS() == 1) { - $message = loadEmailTemplate('confirm-member', array('points' => getConfig('points_register')), bigintval($userid)); + // Send email if updated + $message = loadEmailTemplate('confirm-member', $content, bigintval($userid)); // And send him right away the confirmation mail sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $message); @@ -135,7 +147,7 @@ if (isGetRequestElementSet('hash')) { } // Load template - loadTemplate('guest_confirm_table', false, $content); + loadTemplate('admin_settings_saved', false, $content['message']); } elseif ((isFormSent()) && (isPostRequestElementSet('email'))) { // Confirmation link requested 0 1 2 if (fetchUserData(postRequestElement('email'), 'email')) { diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 1c9a5c64cf..90c8d83eb0 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1222,6 +1222,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen } // Return value + //* DEBUG: */ print 'ret='.$ret.'
'; return $ret; } // Getter fro ref level percents @@ -1365,7 +1366,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify // Load email template $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid)); - sendEmail(getUserData('email'), THANX_REFERRAL_ONE, $message); + sendEmail(getUserData('email'), THANX_REFERAL_ONE, $message); } elseif (($sendNotify) && (getUserData('refid') == 0) && ($locked === false) && ($add_mode == 'direct')) { // Prepare content $content = array( @@ -1427,8 +1428,9 @@ function updateReferalCounter ($userid) { if (($ref > 0) && ($ref != $userid)) { // Move to next referal level and count his counter one up! //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):ref={$ref} - ADVANCE!
"); - $GLOBALS['cache_array']['ref_level'][$userid]++; updateReferalCounter($ref); - } elseif ((($ref == $userid) || ($ref == 0)) && (getExtensionVersion('cache') >= '0.1.2')) { + $GLOBALS['cache_array']['ref_level'][$userid]++; + updateReferalCounter($ref); + } elseif ((($ref == $userid) || ($ref == 0)) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) { // Remove cache here //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):ref={$ref} - CACHE!
"); rebuildCacheFile('refsystem', 'refsystem'); diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index aa7b6a0218..9d61c0cf94 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -728,8 +728,11 @@ function getUserData ($column) { // Geter for whole user data array function getUserDataArray () { + // User id should not be zero + if (getCurrentUserId() == 0) debug_report_bug('User id is zero.'); + // Get the whole array - return $GLOBALS['user_data']; + return $GLOBALS['user_data'][getCurrentUserId()]; } // Checks if the user data is valid, this may indicate that the user has logged diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index b53800249b..887c5d349d 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -22,7 +22,7 @@ - {--ADMIN_DOUBLER_REFERRAL--}: + {--ADMIN_DOUBLER_REFERAL--}:   diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index 145b93e3dd..4a2186b537 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -1,7 +1,7 @@ @@ -15,7 +15,7 @@ $content[rows]
- {--ADMIN_LIST_REFERRALS_1--}$content[userid]{--ADMIN_LIST_REFERRALS_2--} + {--ADMIN_LIST_REFERALS_1--}$content[userid]{--ADMIN_LIST_REFERALS_2--}
-
{--ADMIN_LIST_REFERRALS_NOTE--}
+
{--ADMIN_LIST_REFERALS_NOTE--}
diff --git a/templates/de/html/admin/admin_list_refs2.tpl b/templates/de/html/admin/admin_list_refs2.tpl index 76a1bfa910..452587d0e6 100644 --- a/templates/de/html/admin/admin_list_refs2.tpl +++ b/templates/de/html/admin/admin_list_refs2.tpl @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@ $content[rows]
- {--ADMIN_LIST_REFERRALS_1--}$content[userid]{--ADMIN_LIST_REFERRALS_2--} + {--ADMIN_LIST_REFERALS_1--}$content[userid]{--ADMIN_LIST_REFERALS_2--}
 
 
- {--ADMIN_LIST_REFERRALS_NOTE--} + {--ADMIN_LIST_REFERALS_NOTE--}
diff --git a/templates/de/html/admin/admin_list_refs_level.tpl b/templates/de/html/admin/admin_list_refs_level.tpl index fc2ba2e256..8a3d37c060 100644 --- a/templates/de/html/admin/admin_list_refs_level.tpl +++ b/templates/de/html/admin/admin_list_refs_level.tpl @@ -3,7 +3,7 @@ diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 4cdc16d17c..0c8e62a0ad 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -113,7 +113,7 @@ - + diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index fccf3f1c24..2759f6ff01 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -36,7 +36,7 @@ - + diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 1e73a578f3..1c604d91b1 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -79,7 +79,7 @@ - diff --git a/templates/de/html/guest/guest_top10.tpl b/templates/de/html/guest/guest_top10.tpl index 92e85e18ce..c7567304bd 100644 --- a/templates/de/html/guest/guest_top10.tpl +++ b/templates/de/html/guest/guest_top10.tpl @@ -83,7 +83,7 @@ {--_UID--}: - + $content[rows] -- 2.39.5
- {--ADMIN_LIST_REFERRALS_LEVEL_1--}$content[level]{--ADMIN_LIST_REFERRALS_LEVEL_2--}
+ {--ADMIN_LIST_REFERALS_LEVEL_1--}$content[level]{--ADMIN_LIST_REFERALS_LEVEL_2--}
$content[info]
$content[refid]
{--SPONSOR_REFERRALS--}: {--SPONSOR_REFERALS--}:  [ $content[ref_count] ]
{--MAILS_SENT--}: {--CLICK_RATE--}: {--POINTS_LOCKED--}:{--TOTAL_REFERRALS--}:{--TOTAL_REFERALS--}:
 {--TOTAL_POINTS--}:
$content[total] 		{--TOTAL_REFERRALS--}:
+ 		{--TOTAL_REFERALS--}:
$content[refs] 		{--TOTAL_CATS--}:
diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index b7c793b877..7017ad5744 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -73,12 +73,12 @@
{--DOUBLER_FULL_PAYOUT--}


- {--DOUBLER_REFERRAL_1--} $content[ref]% - {--DOUBLER_REFERRAL_2--} {--DOUBLER_REFERRAL_3--} - {--DOUBLER_REFERRAL_4--} {--DOUBLER_REFERRAL_5--} 100 - {?POINTS?} {--DOUBLER_REFERRAL_6--} 100 {?POINTS?} - {--DOUBLER_REFERRAL_8--} 300 {?POINTS?} - {--DOUBLER_REFERRAL_8--} {--DOUBLER_REFERRAL_LINK--}
+ {--DOUBLER_REFERAL_1--} $content[ref]% + {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} + {--DOUBLER_REFERAL_4--} {--DOUBLER_REFERAL_5--} 100 + {?POINTS?} {--DOUBLER_REFERAL_6--} 100 {?POINTS?} + {--DOUBLER_REFERAL_8--} 300 {?POINTS?} + {--DOUBLER_REFERAL_8--} {--DOUBLER_REFERAL_LINK--}
$content[message]
{--DOUBLER_NOT_YET_REGISTERED--} {--DOUBLER_REGISTER_NOW--}
diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index 4f15976ecc..8f53bc12d2 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -16,9 +16,9 @@
  • {--DOUBLER_FULL_PAYOUT--}
  • {--DOUBLER_POINTS_1--} $content[charge]% {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
    • -
  • {--DOUBLER_REFERRAL_1--} $content[ref]% {--DOUBLER_REFERRAL_2--} {--DOUBLER_REFERRAL_3--} {--DOUBLER_REFERRAL_4--} -
  • {--DOUBLER_REFERRAL_5--} 100 {?POINTS?} {--DOUBLER_REFERRAL_6--} 100 {?POINTS?} {--DOUBLER_REFERRAL_8--} 300 {?POINTS?} {--DOUBLER_REFERRAL_8--}
    • -
  • {--DOUBLER_REFERRAL_LINK--}
    • +
  • {--DOUBLER_REFERAL_1--} $content[ref]% {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--} +
  • {--DOUBLER_REFERAL_5--} 100 {?POINTS?} {--DOUBLER_REFERAL_6--} 100 {?POINTS?} {--DOUBLER_REFERAL_8--} 300 {?POINTS?} {--DOUBLER_REFERAL_8--}
    • +
  • {--DOUBLER_REFERAL_LINK--}
  • {--DOUBLER_TIMEOUT_1--} $content[timeout_mark] {--DOUBLER_TIMEOUT_2--}
  • {--DOUBLER_HAVE_FUN--}
  • {--DOUBLER_WANNA_TRY--}
    • diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index b093814b67..4a1f1f4142 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -242,7 +242,7 @@
      - {--SPONSOR_REFERRAL--} + {--SPONSOR_REFERAL--}  
    - {--TOTAL_REFERRALS--}: + {--TOTAL_REFERALS--}: {--TOTAL_POINTS--}: diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl index dc470253d2..74c869ce2c 100644 --- a/templates/de/html/member/member_doubler.tpl +++ b/templates/de/html/member/member_doubler.tpl @@ -40,14 +40,14 @@ $content[payout_ref] {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
    • -
  • {--DOUBLER_REFERRAL_1--} $content[ref]% - {--DOUBLER_REFERRAL_2--} {--DOUBLER_REFERRAL_3--} - {--DOUBLER_REFERRAL_4--} -
  • {--DOUBLER_REFERRAL_5--} 100 {?POINTS?} - {--DOUBLER_REFERRAL_6--} 100 {?POINTS?} - {--DOUBLER_REFERRAL_8--} 300 {?POINTS?} - {--DOUBLER_REFERRAL_8--}
    • -
  • {--DOUBLER_REFERRAL_LINK--}
    • +
  • {--DOUBLER_REFERAL_1--} $content[ref]% + {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} + {--DOUBLER_REFERAL_4--} +
  • {--DOUBLER_REFERAL_5--} 100 {?POINTS?} + {--DOUBLER_REFERAL_6--} 100 {?POINTS?} + {--DOUBLER_REFERAL_8--} 300 {?POINTS?} + {--DOUBLER_REFERAL_8--}
    • +
  • {--DOUBLER_REFERAL_LINK--}
  • {--DOUBLER_TIMEOUT_1--} $content[timeout_mark] {--DOUBLER_TIMEOUT_2--}
  • {--DOUBLER_HAVE_FUN--}
    • diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 4580daedaa..4c48d7bb7f 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -8,7 +8,7 @@     		{?POINTS?} {--REFERRALS--}{--REFERALS--}