Fixes for doubler (not fully fixed) and rewrites for beg/doubler:

- Many fixes for doubler link (was broken due to bad EL syntax)
- Rewrites to make lesser use of SOME_FOO_1/SOME_FOO_2 (should be SOME_FOO)
- Fixes for beg extension
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 346184b921335684f1774f8f94a15c042d48c396..36eae95c8b1a201dd0f9e8c147cc14a0ee3b6b06 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -1,7 +1,7 @@
 ### WARNING: THIS FILE IS AUTO-GENERATED BY ./DOCS/todo-builder.sh (uid=/user=quix0r) ###
 ### DO NOT EDIT THIS FILE. ###
 ./autoreg.php:60:// @TODO Add processing of request here
-./beg.php:172:                 // @TODO Opps, what is missing here???
+./beg.php:165:                 // @TODO Opps, what is missing here???
 ./birthday_confirm.php:99:             // @TODO Try to rewrite the following unset()
 ./inc/autopurge/purge-inact.php:57:    // @TODO Rewrite these if() blocks to a filter
 ./inc/cache/config-local.php:126:// @TODO Rewrite the following three constants, somehow...

diff --git a/beg.php b/beg.php
index 65516a55b635e08dadffb71a1f4e4e66b88fb6f1..7dd2d6a78b399abe7048f7d462ee3bd14143c05d 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -91,10 +91,10 @@ if (isGetRequestParameterSet('userid')) {
                $points = mt_rand((getConfig('beg_points') * 100000), (getConfig('beg_points_max') * 100000)) / 100000;
 
                // Set nickname / userid for template
-               $content['userid']      = getRequestParameter('userid');
-               $content['clicks']      = (getUserData('beg_clicks') + 1);
-               $content['banner']      = loadTemplate('beg_banner', true);
-               $content['points']      = translateComma($points);
+               $content['userid'] = getRequestParameter('userid');
+               $content['clicks'] = (getUserData('beg_clicks') + 1);
+               $content['banner'] = loadTemplate('beg_banner', true);
+               $content['points'] = $points;
        } // END - if
 
        // User id valid and not webmaster's id?
@@ -142,13 +142,6 @@ if (isGetRequestParameterSet('userid')) {
                        // Logged in user found!
                        $content['message'] = loadTemplate('beg_login', true, $content);
                } elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active!
-                       // Prepare content for template
-                       $content = array(
-                               'clicks' => $content['clicks'],
-                               'points' => $content['points'],
-                               'userid' => $content['userid']
-                       );
-
                        // Load message template depending on pay-mode
                        $content['message'] = loadTemplate('beg_pay_mode_'.strtolower(getConfig('beg_pay_mode')), true, $content);
                        $pay = true;

diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php
index 5028dbe970f25e09ca6368b9cdd2bf4f59a86ebb..36bd1a50084514e852f5a26c19817b77af36ae44 100644 (file)
--- a/inc/language/doubler_de.php
+++ b/inc/language/doubler_de.php
@@ -80,7 +80,7 @@ addMessages(array(
        'ADMIN_DOUBLER_LIST_WAITING_ALL' => "Alle wartenden {?POINTS?}-Auszahlungen",
        'ADMIN_DOUBLER_LIST_WAITING_DIRECT' => "Wartende Direkt-Auszahlungen",
        'ADMIN_DOUBLER_LIST_WAITING_REF' => "Wartende Referal-Auszahlungen",
-       'DOUBLER_TITLE' => "Verdoppler",
+       'DOUBLER_TITLE' => "{?POINTS?}-Verdoppler",
        'DOUBLER_ENTER_LOGIN_DATA' => "Geben Sie hier Ihre Zugangsdaten ein",
        'DOUBLER_NOTE_FOR_PASSWORD' => "Das Passwort wird nicht gespeichert.",
        'DOUBLER_ENTER_POINTS' => "{?POINTS?} zum Verdoppeln",
@@ -95,16 +95,9 @@ 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_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_REFERAL_1' => "Refverdienst: Es gibt <strong>{%config,translateComma=doubler_ref%}&#37;</strong> Refverdienst. Wenn Sie {?POINTS?} auf dem Refkonto durch Werbung erwirtschaftet haben, (Wichtig! Maximal Verdoppelung darf nicht &uuml;berschritten werden) werden diese bei Ihrer n&auml;chsten Verdoppelung aufgeschlagen.",
+       'DOUBLER_REFERAL_2' => "Beispiel: Sie haben <strong>100 {?POINTS?}</strong> Refverdienst und verdoppeln <strong>100 {?POINTS?}</strong>, Sie bekommen - sobald Sie an der Reihe sind - <strong>300 {?POINTS?}</strong> zur&uuml;ck.",
+       'DOUBLER_TIMEOUT_1' => "Es werden Eintr&auml;ge nicht &auml;lter als <strong>{%config,createFancyTime=doubler_timeout%}</strong> angezeigt.",
        'DOUBLER_REFERAL_LINK' => "Den Reflink erfahren Sie nach jeder Verdoppelung.",
        'DOUBLER_NOT_YET_REGISTERED' => "Noch nicht angemeldet?",
        'DOUBLER_REGISTER_NOW' => "Weiter zur Anmeldung.",
@@ -139,10 +132,8 @@ addMessages(array(
        'DOUBLER_MEMBER_REF_PAYOUT' => "Ihr Refferal-Verdienst",
        'DOUBLER_MEMBER_YOUR_LINK' => "Hier ist Ihr Verdoppler-Link",
        'DOUBLER_MEMBER_YOUR_REFLINK' => "Ihr Referal-Link zum Verdoppeln",
-       'DOUBLER_POINTS_LEFT_1' => "Es stehen noch",
-       'DOUBLER_POINTS_LEFT_2' => "zum Verdoppeln zur Verf&uuml;gung.",
-       'DOUBLER_USAGE_COUNTER_1' => "Der Verdoppler wurde bereits",
-       'DOUBLER_USAGE_COUNTER_2' => "mal genutzt.",
+       'DOUBLER_POINTS_LEFT' => "Es stehen noch <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> zum Verdoppeln zur Verf&uuml;gung.",
+       'DOUBLER_USAGE_COUNTER' => "Der Verdoppler wurde bereits <strong>{%config,translateComma=doubler_counter%}</strong> mal genutzt.",
        'MEMBER_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.",
        'GUEST_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.",
        'ADMIN_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.",

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 81c6d2f5e15b77992957f31e172574f03d32aa23..dac3329ac9f71e311291f2732944b78bf1e1d32f 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -240,7 +240,7 @@ function doFinalCompilation ($code, $insertComments = true) {
                $newContent = '';
 
                // Compile it
-               //* DEBUG: */ debugOutput('<pre>'.encodeEntities($code).'</pre>');
+               //* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');
                $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
                //* DEBUG: */ if (!$insertComments) print('<pre>'.linenumberCode($eval).'</pre>');
                eval($eval);

diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl
index 738d1264abff9275273a09486af2f95d1762103b..e148b3fece109ddc7e160a3618e6d6acb2e3b2e6 100644 (file)
--- a/templates/de/html/beg/beg_done.tpl
+++ b/templates/de/html/beg/beg_done.tpl
@@ -1,5 +1,5 @@
 <div>
-       {--BEG_UID_STEAL_1--}<strong>$content[userid]</strong>{--BEG_UID_STEAL_2--}<strong>$content[points]</strong>{--BEG_UID_STEAL_3--}
+       {--BEG_UID_STEAL_1--}<strong>$content[userid]</strong>{--BEG_UID_STEAL_2--}<strong>{%pipe,translateComma=$content[points]%}</strong>{--BEG_UID_STEAL_3--}
 </div>
 
 <div>

diff --git a/templates/de/html/beg/beg_failed.tpl b/templates/de/html/beg/beg_failed.tpl
index a5d387f8844cd6645108b48fb67651aaf8c47358..a1324991b12b13062906138a770d617d6034e210 100644 (file)
--- a/templates/de/html/beg/beg_failed.tpl
+++ b/templates/de/html/beg/beg_failed.tpl
@@ -1,5 +1,5 @@
 <div>
-       {--BEG_SORRY_ANOTHER_WAS_HERE_1--}<strong>$content[userid]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<strong>$content[points]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}
+       {--BEG_SORRY_ANOTHER_WAS_HERE_1--}<strong>$content[userid]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<strong>{%pipe,translateComma=$content[points]%}</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}
 </div>
 
 <div>

diff --git a/templates/de/html/beg/beg_login.tpl b/templates/de/html/beg/beg_login.tpl
index 93b54de940d54757e568cc0a1adb94a72b002832..afab3ab6f8da8c6d15dd782f818ffdf46d42baa2 100644 (file)
--- a/templates/de/html/beg/beg_login.tpl
+++ b/templates/de/html/beg/beg_login.tpl
@@ -1,5 +1,5 @@
 <div>
-       {--BEG_SORRY_YOURE_LOGGED_IN_1--}<strong>$content[userid]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<strong>$content[points]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_3--}
+       {--BEG_SORRY_YOURE_LOGGED_IN_1--}<strong>$content[userid]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<strong>{%pipe,translateComma=$content[points]%}</strong>{--BEG_SORRY_YOURE_LOGGED_IN_3--}
 </div>
 
 <div>

diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl
index a5e63c026819cd83df1549f375b77d81ad8925bb..29d9c6daac06b08df7b3d2dde0958323d155a257 100644 (file)
--- a/templates/de/html/doubler/doubler_index.tpl
+++ b/templates/de/html/doubler/doubler_index.tpl
@@ -5,7 +5,7 @@
        </tr>
        <tr>
                <td align="center" class="doubler_main">
-               <h3 class="huge">{?POINTS?}-{--DOUBLER_TITLE--} - {?MAIN_TITLE?}</h3>
+               <h3 class="huge">{--DOUBLER_TITLE--} - {?MAIN_TITLE?}</h3>
                <br />
                $content[enter_login]<br />
                {--DOUBLER_NOTE_FOR_PASSWORD--}<br />
@@ -14,7 +14,7 @@
                <table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed">
                        <tr>
                                <td colspan="2" class="guest_title bottom">
-                                       <strong>{?POINTS?}-{--DOUBLER_TITLE--}</strong><br />
+                                       <strong>{--DOUBLER_TITLE--}</strong><br />
                                        <div class="doubler_error">$content[message]</div>
                                </td>
                        </tr>
@@ -51,9 +51,9 @@
                </table>
                </form>
                <br />
-               {%message,DOUBLER_ALREADY_PAYED={%config,translateComma=doubler_points%}%}<br />
-               {--DOUBLER_POINTS_LEFT_1--} <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}<br />
-               {--DOUBLER_USAGE_COUNTER_1--} <strong>{%config,translateComma=doubler_counter%}</strong> {--DOUBLER_USAGE_COUNTER_2--}<br />
+               {--DOUBLER_ALREADY_PAYED--}<br />
+               {--DOUBLER_POINTS_LEFT--}<br />
+               {--DOUBLER_USAGE_COUNTER--}<br />
                <br />
                {--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong>
                {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong><br />
@@ -69,12 +69,9 @@
                <br />
                <div class="big">{--DOUBLER_FULL_PAYOUT--}</div><br />
                <br />
-               {--DOUBLER_REFERAL_1--} <strong>{%config,translateComma=doubler_ref%}%</strong>
-               {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--}
-               {--DOUBLER_REFERAL_4--} {--DOUBLER_REFERAL_5--} <strong>100
-               {?POINTS?}</strong> {--DOUBLER_REFERAL_6--} <strong>100 {?POINTS?}</strong>
-               {--DOUBLER_REFERAL_8--} <strong>300 {?POINTS?}</strong>
-               {--DOUBLER_REFERAL_8--} {--DOUBLER_REFERAL_LINK--}<br />
+               {--DOUBLER_REFERAL_1--}
+               {--DOUBLER_REFERAL_2--}
+               {--DOUBLER_REFERAL_LINK--}<br />
                $content[message]<br />
                {--DOUBLER_NOT_YET_REGISTERED--} <a
                        href="{%url=ref.php?refid=$content[refid]%}">{--DOUBLER_REGISTER_NOW--}</a><br />

diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl
index e0dfdfcc228405ba6424085769a933c14273f708..1dc7d9f39d056b27c999c6356371b8ce981654be 100644 (file)
--- a/templates/de/html/guest/guest_doubler.tpl
+++ b/templates/de/html/guest/guest_doubler.tpl
@@ -10,16 +10,16 @@
                        <ul>
                        <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
                        <li>{--DOUBLER_ALREADY_PAYED--}</li>
-                       <li>{--DOUBLER_POINTS_LEFT_1--} <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
-                       <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{%config,translateComma=doubler_counter%}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
+                       <li>{--DOUBLER_POINTS_LEFT--}</li>
+                       <li>{--DOUBLER_USAGE_COUNTER--}</li>
                        <li>$content[payout_time]</li>
                        <li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
                        <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong> {--DOUBLER_POINTS_2--}</li>
                        <li>{--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {?POINTS?}</strong>{--DOUBLER_EXAMPLE_3--}</li>
-                       <li>{--DOUBLER_REFERAL_1--} <strong>{%config,translateComma=doubler_ref%}]%</strong> {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--}
-                       <li>{--DOUBLER_REFERAL_5--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_6--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--} <strong>300 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--}</li>
+                       <li>{--DOUBLER_REFERAL_1--}
+                       <li>{--DOUBLER_REFERAL_2--}</li>
                        <li>{--DOUBLER_REFERAL_LINK--}</li>
-                       <li>{--DOUBLER_TIMEOUT_1--} <strong>{%config,createFancyTime=doubler_timeout%}</strong> {--DOUBLER_TIMEOUT_2--}</li>
+                       <li>{--DOUBLER_TIMEOUT--}</li>
                        <li>{--DOUBLER_HAVE_FUN--}</li>
                        <li><strong><a href="{%url=doubler.php%}">{--DOUBLER_WANNA_TRY--}</a></strong></li>
                        </ul>

diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl
index 2dd2d3fca578a5c71457412c37b479fd7a06136d..56b624b63dba6a0e107854e44cf9c5712f503455 100644 (file)
--- a/templates/de/html/member/member_doubler.tpl
+++ b/templates/de/html/member/member_doubler.tpl
@@ -29,16 +29,16 @@
                <ul>
                        <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
                        <li>Es wurden bereits <strong>{%config,translateComma=doubler_points%} {?POINTS?}</strong> ausgezahlt.</li>
-                       <li>{--DOUBLER_POINTS_LEFT_1--} <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
-                       <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{%config,translateComma=doubler_counter%}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
+                       <li>{--DOUBLER_POINTS_LEFT--}</li>
+                       <li>{--DOUBLER_USAGE_COUNTER--}</li>
                        <li>$content[payout_time]</li>
                        <li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
                        <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong> {--DOUBLER_POINTS_2--}</li>
                        <li>{--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {?POINTS?}</strong>{--DOUBLER_EXAMPLE_3--}</li>
-                       <li>{--DOUBLER_REFERAL_1--} <strong>{%config,translateComma=doubler_ref%}%</strong> {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--}</li>
-                       <li>{--DOUBLER_REFERAL_5--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_6--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--} <strong>300 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--}</li>
+                       <li>{--DOUBLER_REFERAL_1--}</li>
+                       <li>{--DOUBLER_REFERAL_2--}</li>
                        <li>{--DOUBLER_REFERAL_LINK--}</li>
-                       <li>{--DOUBLER_TIMEOUT_1--} <strong>{%config,createFancyTime=doubler_timeout%}</strong> {--DOUBLER_TIMEOUT_2--}</li>
+                       <li>{--DOUBLER_TIMEOUT--}</li>
                        <li>{--DOUBLER_HAVE_FUN--}</li>
                </ul>
        </div>