From 39f1b96b1f0c0399fca1a0f7297f7d41653cbc81 Mon Sep 17 00:00:00 2001 From: quix0r Date: Wed, 31 Mar 2010 19:44:11 +0000 Subject: [PATCH] TODOs.txt updated, template fixed --- DOCS/TODOs.txt | 23 ++++++++++--------- inc/libs/surfbar_functions.php | 4 ++-- .../member/member_surfbar_low_points.tpl | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index f098b63a62..a008587de7 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -41,16 +41,16 @@ ./inc/extensions-functions.php:493: // @TODO Extension is loaded, what next? ./inc/functions.php:1026:// @TODO $simple is deprecated ./inc/functions.php:1061: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates -./inc/functions.php:2537: // @TODO Add a little more infos here +./inc/functions.php:2535: // @TODO Add a little more infos here ./inc/functions.php:256: // @TODO Remove this sanity-check if all is fine ./inc/functions.php:259: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2620: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:2643: // @TODO Rewrite this old lost code to a template -./inc/functions.php:2733: // @TODO Are these convertions still required? -./inc/functions.php:2751:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:3630:// @TODO Lame description for this function -./inc/functions.php:3652: // @TODO Move this in a filter -./inc/functions.php:3776: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2618: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:2641: // @TODO Rewrite this old lost code to a template +./inc/functions.php:2731: // @TODO Are these convertions still required? +./inc/functions.php:2749:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:3628:// @TODO Lame description for this function +./inc/functions.php:3650: // @TODO Move this in a filter +./inc/functions.php:3774: // @TODO This is still very static, rewrite it somehow ./inc/functions.php:474: // @TODO Do only use $content, not $DATA or raw variables ./inc/functions.php:544: // @TODO Extension 'msg' does not exist ./inc/functions.php:613:// @TODO Rewrite this to an extension 'smtp' @@ -77,8 +77,9 @@ ./inc/libs/register_functions.php:373: // @TODO Rewrite this to a filter ./inc/libs/register_functions.php:380: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete ./inc/libs/register_functions.php:381: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable -./inc/libs/surfbar_functions.php:1530: // @TODO This can be somehow rewritten -./inc/libs/surfbar_functions.php:963: // @TODO Invalid salt should be refused +./inc/libs/surfbar_functions.php:1556: // @TODO This can be somehow rewritten +./inc/libs/surfbar_functions.php:724:// @TODO Can't we use our new expression language instead of this ugly code? +./inc/libs/surfbar_functions.php:972: // @TODO Invalid salt should be refused ./inc/libs/task_functions.php:245: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters ./inc/libs/user_functions.php:138: // @TODO These two constants are no longer used, maybe we reactivate this code? @@ -94,7 +95,6 @@ ./inc/modules/admin/admin-inc.php:325: // @TODO Rewrite this to $content = SQL_FETCHARRAY() ./inc/modules/admin/admin-inc.php:331: // @TODO ACL is 'allow'... hmmm ./inc/modules/admin/admin-inc.php:431:// @TODO Try to rewrite this to adminAddMenuSelectionBox() -./inc/modules/admin/admin-inc.php:445: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query ./inc/modules/admin/overview-inc.php:164: // @TODO Rewrite this to a filter ./inc/modules/admin/overview-inc.php:278: // @TODO Rewrite this to something with include files and/or filter ./inc/modules/admin/overview-inc.php:316: // @TODO This may also be rewritten to include files @@ -150,6 +150,7 @@ ./inc/modules/admin/what-mem_add.php:81: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-payments.php:152: // @TODO Rewritings: title->mail_title, pay->payment in template ./inc/modules/admin/what-refbanner.php:145: // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template +./inc/modules/admin/what-surfbar_stats.php:119: // @TODO Can't all these translation blocks moved into templates? This code looks ugly. ./inc/modules/admin/what-unlock_emails.php:89: // @TODO Rewrite these if-blocks to a filter ./inc/modules/admin/what-unlock_sponsor.php:192: // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template ./inc/modules/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 01173c9de3..b36ceb782a 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -298,7 +298,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) { function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) { // Create the data array for next function call $data = array( - $urlData['id'] => $urlData + $urlData['id'] => $urlData ); // Simply change the status here @@ -493,7 +493,7 @@ function SURFBAR_HANDLE_LOW_POINTS () { if ((time() - $userids['notified'][$userid]) >= getConfig('surfbar_low_interval')) { // Prepare content $content = array( - 'userid' => $userid, + 'userid' => $userid, 'low' => translateComma(getConfig('surfbar_warn_low_points')), 'points' => translateComma($userids['points'][$userid]), 'notified' => generateDateTime($userids['notified'][$userid]), diff --git a/templates/de/emails/member/member_surfbar_low_points.tpl b/templates/de/emails/member/member_surfbar_low_points.tpl index 0c23e7a770..0a964121fa 100644 --- a/templates/de/emails/member/member_surfbar_low_points.tpl +++ b/templates/de/emails/member/member_surfbar_low_points.tpl @@ -1,6 +1,6 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Sie haben in unserer Surfbar mindestens eine URL gebucht. Ihr {?POINTS?}-Stand ist unter dem Limit von $content[low] {?POINTS?} gefallen. Ihre gebuchte(n) URL(s) wird/werden bei einem Guthaben von 0 {?POINTS?} nicht mehr aufgerufen. +Sie haben in unserer Surfbar mindestens eine URL gebucht. Ihr {?POINTS?}-Stand ist unter dem Limit von $content[low] {?POINTS?} gefallen worüber Sie informiert werden wollten. Ihre gebuchte(n) URL(s) wird/werden bei einem Guthaben von 0 {?POINTS?} nicht mehr aufgerufen. Hier sind alle Daten: ------------------------------------------ -- 2.39.5