From: Roland Häder Date: Sun, 11 Jul 2010 19:55:12 +0000 (+0000) Subject: Fixes for doubler (not fully fixed) and rewrites for beg/doubler: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fc62885f33ca2420975a7117ac9df9bf52082c21;p=mailer.git 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 346184b921..36eae95c8b 100644 --- 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 65516a55b6..7dd2d6a78b 100644 --- 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 5028dbe970..36bd1a5008 100644 --- 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 {%config,translateComma=doubler_ref%}% Refverdienst. Wenn Sie {?POINTS?} auf dem Refkonto durch Werbung erwirtschaftet haben, (Wichtig! Maximal Verdoppelung darf nicht überschritten werden) werden diese bei Ihrer nächsten Verdoppelung aufgeschlagen.", + 'DOUBLER_REFERAL_2' => "Beispiel: Sie haben 100 {?POINTS?} Refverdienst und verdoppeln 100 {?POINTS?}, Sie bekommen - sobald Sie an der Reihe sind - 300 {?POINTS?} zurück.", + 'DOUBLER_TIMEOUT_1' => "Es werden Einträge nicht älter als {%config,createFancyTime=doubler_timeout%} 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ügung.", - 'DOUBLER_USAGE_COUNTER_1' => "Der Verdoppler wurde bereits", - 'DOUBLER_USAGE_COUNTER_2' => "mal genutzt.", + 'DOUBLER_POINTS_LEFT' => "Es stehen noch {%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?} zum Verdoppeln zur Verfügung.", + 'DOUBLER_USAGE_COUNTER' => "Der Verdoppler wurde bereits {%config,translateComma=doubler_counter%} 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 81c6d2f5e1..dac3329ac9 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -240,7 +240,7 @@ function doFinalCompilation ($code, $insertComments = true) { $newContent = ''; // Compile it - //* DEBUG: */ debugOutput('
'.encodeEntities($code).'
'); + //* DEBUG: */ debugOutput('
'.linenumberCode($code).'
'); $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";'; //* DEBUG: */ if (!$insertComments) print('
'.linenumberCode($eval).'
'); eval($eval); diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl index 738d1264ab..e148b3fece 100644 --- a/templates/de/html/beg/beg_done.tpl +++ b/templates/de/html/beg/beg_done.tpl @@ -1,5 +1,5 @@
- {--BEG_UID_STEAL_1--}$content[userid]{--BEG_UID_STEAL_2--}$content[points]{--BEG_UID_STEAL_3--} + {--BEG_UID_STEAL_1--}$content[userid]{--BEG_UID_STEAL_2--}{%pipe,translateComma=$content[points]%}{--BEG_UID_STEAL_3--}
diff --git a/templates/de/html/beg/beg_failed.tpl b/templates/de/html/beg/beg_failed.tpl index a5d387f884..a1324991b1 100644 --- a/templates/de/html/beg/beg_failed.tpl +++ b/templates/de/html/beg/beg_failed.tpl @@ -1,5 +1,5 @@
- {--BEG_SORRY_ANOTHER_WAS_HERE_1--}$content[userid]{--BEG_SORRY_ANOTHER_WAS_HERE_2--}$content[points]{--BEG_SORRY_ANOTHER_WAS_HERE_3--} + {--BEG_SORRY_ANOTHER_WAS_HERE_1--}$content[userid]{--BEG_SORRY_ANOTHER_WAS_HERE_2--}{%pipe,translateComma=$content[points]%}{--BEG_SORRY_ANOTHER_WAS_HERE_3--}
diff --git a/templates/de/html/beg/beg_login.tpl b/templates/de/html/beg/beg_login.tpl index 93b54de940..afab3ab6f8 100644 --- a/templates/de/html/beg/beg_login.tpl +++ b/templates/de/html/beg/beg_login.tpl @@ -1,5 +1,5 @@
- {--BEG_SORRY_YOURE_LOGGED_IN_1--}$content[userid]{--BEG_SORRY_YOURE_LOGGED_IN_2--}$content[points]{--BEG_SORRY_YOURE_LOGGED_IN_3--} + {--BEG_SORRY_YOURE_LOGGED_IN_1--}$content[userid]{--BEG_SORRY_YOURE_LOGGED_IN_2--}{%pipe,translateComma=$content[points]%}{--BEG_SORRY_YOURE_LOGGED_IN_3--}
diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index a5e63c0268..29d9c6daac 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -5,7 +5,7 @@ -

{?POINTS?}-{--DOUBLER_TITLE--} - {?MAIN_TITLE?}

+

{--DOUBLER_TITLE--} - {?MAIN_TITLE?}


$content[enter_login]
{--DOUBLER_NOTE_FOR_PASSWORD--}
@@ -14,7 +14,7 @@ @@ -51,9 +51,9 @@
- {?POINTS?}-{--DOUBLER_TITLE--}
+ {--DOUBLER_TITLE--}
$content[message]

- {%message,DOUBLER_ALREADY_PAYED={%config,translateComma=doubler_points%}%}
- {--DOUBLER_POINTS_LEFT_1--} {%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
- {--DOUBLER_USAGE_COUNTER_1--} {%config,translateComma=doubler_counter%} {--DOUBLER_USAGE_COUNTER_2--}
+ {--DOUBLER_ALREADY_PAYED--}
+ {--DOUBLER_POINTS_LEFT--}
+ {--DOUBLER_USAGE_COUNTER--}

{--DOUBLER_MINIMUM_IS--} {%config,translateComma=doubler_min%} {?POINTS?} {--DOUBLER_MAXIMUM_IS--} {%config,translateComma=doubler_max%} {?POINTS?}
@@ -69,12 +69,9 @@
{--DOUBLER_FULL_PAYOUT--}


- {--DOUBLER_REFERAL_1--} {%config,translateComma=doubler_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_REFERAL_1--} + {--DOUBLER_REFERAL_2--} + {--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 e0dfdfcc22..1dc7d9f39d 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -10,16 +10,16 @@
  • {--DOUBLER_MINIMUM_IS--} {%config,translateComma=doubler_min%} {?POINTS?} {--DOUBLER_MAXIMUM_IS--} {%config,translateComma=doubler_max%} {?POINTS?}
  • {--DOUBLER_ALREADY_PAYED--}
    • -
  • {--DOUBLER_POINTS_LEFT_1--} {%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
    • -
  • {--DOUBLER_USAGE_COUNTER_1--} {%config,translateComma=doubler_counter%} {--DOUBLER_USAGE_COUNTER_2--}
    • +
  • {--DOUBLER_POINTS_LEFT--}
    • +
  • {--DOUBLER_USAGE_COUNTER--}
  • $content[payout_time]
  • {--DOUBLER_FULL_PAYOUT--}
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
    • -
  • {--DOUBLER_REFERAL_1--} {%config,translateComma=doubler_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_1--} +
  • {--DOUBLER_REFERAL_2--}
  • {--DOUBLER_REFERAL_LINK--}
    • -
  • {--DOUBLER_TIMEOUT_1--} {%config,createFancyTime=doubler_timeout%} {--DOUBLER_TIMEOUT_2--}
    • +
  • {--DOUBLER_TIMEOUT--}
  • {--DOUBLER_HAVE_FUN--}
  • {--DOUBLER_WANNA_TRY--}
diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl index 2dd2d3fca5..56b624b63d 100644 --- a/templates/de/html/member/member_doubler.tpl +++ b/templates/de/html/member/member_doubler.tpl @@ -29,16 +29,16 @@
  • {--DOUBLER_MINIMUM_IS--} {%config,translateComma=doubler_min%} {?POINTS?} {--DOUBLER_MAXIMUM_IS--} {%config,translateComma=doubler_max%} {?POINTS?}
  • Es wurden bereits {%config,translateComma=doubler_points%} {?POINTS?} ausgezahlt.
    • -
  • {--DOUBLER_POINTS_LEFT_1--} {%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
    • -
  • {--DOUBLER_USAGE_COUNTER_1--} {%config,translateComma=doubler_counter%} {--DOUBLER_USAGE_COUNTER_2--}
    • +
  • {--DOUBLER_POINTS_LEFT--}
    • +
  • {--DOUBLER_USAGE_COUNTER--}
  • $content[payout_time]
  • {--DOUBLER_FULL_PAYOUT--}
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
    • -
  • {--DOUBLER_REFERAL_1--} {%config,translateComma=doubler_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_1--}
    • +
  • {--DOUBLER_REFERAL_2--}
  • {--DOUBLER_REFERAL_LINK--}
    • -
  • {--DOUBLER_TIMEOUT_1--} {%config,createFancyTime=doubler_timeout%} {--DOUBLER_TIMEOUT_2--}
    • +
  • {--DOUBLER_TIMEOUT--}
  • {--DOUBLER_HAVE_FUN--}