From: Roland Häder Date: Fri, 6 Nov 2009 16:58:29 +0000 (+0000) Subject: More fixes for task->sel convert and deprecated script found X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=785a529a1fdffeba4057a646f977d5d81fced371 More fixes for task->sel convert and deprecated script found --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index e6c7cde386..4b7778c9c8 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -16,23 +16,26 @@ ./inc/extensions/ext-yoomedia.php:55:// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y'); ./inc/extensions-functions.php:376:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:489: // @TODO Extension is loaded, what next? -./inc/functions.php:225: // @TODO Remove this sanity-check if all is fine -./inc/functions.php:228: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2352:// @TODO Try to move this to inc/libs/theme_functions.php -./inc/functions.php:2523:// @TODO Please describe this function -./inc/functions.php:2541: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); -./inc/functions.php:2637: // @TODO Add a little more infos here -./inc/functions.php:2648: // @TODO This cannot be rewritten to app_die(), try to find a solution for this. -./inc/functions.php:2730: // @TODO Rewrite this old lost code to a template -./inc/functions.php:2819: // @TODO Are these convertions still required? -./inc/functions.php:2837:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:546: // @TODO Extension 'msg' does not exist -./inc/functions.php:615:// @TODO Rewrite this to an extension 'smtp' +./inc/functions.php:1010:// @TODO $simple is deprecated +./inc/functions.php:1045: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates +./inc/functions.php:2345:// @TODO Try to move this to inc/libs/theme_functions.php +./inc/functions.php:241: // @TODO Remove this sanity-check if all is fine +./inc/functions.php:244: // @TODO Try to rewrite all $DATA to $content +./inc/functions.php:2516:// @TODO Please describe this function +./inc/functions.php:2534: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); +./inc/functions.php:2630: // @TODO Add a little more infos here +./inc/functions.php:2641: // @TODO This cannot be rewritten to app_die(), try to find a solution for this. +./inc/functions.php:2724: // @TODO Rewrite this old lost code to a template +./inc/functions.php:2813: // @TODO Are these convertions still required? +./inc/functions.php:2831:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:467: // @TODO Do only use $contentn, not $DATA or raw variables +./inc/functions.php:537: // @TODO Extension 'msg' does not exist +./inc/functions.php:606:// @TODO Rewrite this to an extension 'smtp' ./inc/install-functions.php:62: // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); -./inc/language/de.php:1141:// @TODO Rewrite these two constants -./inc/language/de.php:1157:// @TODO Rewrite these five constants -./inc/language/de.php:736:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used. -./inc/language/de.php:844:// @TODO Are these constants longer used? +./inc/language/de.php:1142:// @TODO Rewrite these two constants +./inc/language/de.php:1158:// @TODO Rewrite these five constants +./inc/language/de.php:737:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used. +./inc/language/de.php:845:// @TODO Are these constants longer used? ./inc/language-functions.php:45:// @TODO Rewrite all language constants to this function. ./inc/language/holiday_de.php:49:// @TODO Rewrite these two constants to one ./inc/language/rallye_de.php:113:// @TODO Rewrite following two lines to one @@ -43,8 +46,8 @@ ./inc/libs/beg_functions.php:57: // @TODO Try to rewrite the following unset() ./inc/libs/bonus_functions.php:215: // @TODO Try to find a way for rewriting this constant ./inc/libs/doubler_functions.php:45:// @TODO Lame description -./inc/libs/rallye_functions.php:699: $EXPIRE = 3; // @TODO The hard-coded value... -./inc/libs/rallye_functions.php:763: // @TODO Rewrite this to our API function +./inc/libs/rallye_functions.php:718: $EXPIRE = 3; // @TODO The hard-coded value... +./inc/libs/rallye_functions.php:782: // @TODO Rewrite this to our API function ./inc/libs/refback_functions.php:60: // @TODO Try to rewrite the following unset() ./inc/libs/surfbar_functions.php:1497: // @TODO This can be somehow rewritten ./inc/libs/surfbar_functions.php:950: // @TODO Invalid salt should be refused @@ -76,38 +79,36 @@ ./inc/modules/admin/what-admin_add.php:119: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-admin_add.php:60: // @TODO Cant this be rewritten? ./inc/modules/admin/what-admin_add.php:76: // @TODO This can be somehow rewritten to a function -./inc/modules/admin/what-adminedit.php:61: // @TODO Kill all constants in this file -./inc/modules/admin/what-admins_mails.php:60: // @TODO Can this be rewritten??? +./inc/modules/admin/what-adminedit.php:57: // @TODO Kill all constants in this file +./inc/modules/admin/what-admins_mails.php:59: // @TODO Can this be rewritten??? ./inc/modules/admin/what-bonus.php:47:// @TODO Unused at the moment ./inc/modules/admin/what-chk_regs.php:65: // @TODO Rewritings: surname->surname,family->family,ip->REMOTE_ADDR,ref->refid,hash->user_hash in template -./inc/modules/admin/what-config_admins.php:148: // @TODO Rewrite this to filter 'run_sqls' -./inc/modules/admin/what-config_mods.php:137: // @TODO Rewritings: mod->module in template -./inc/modules/admin/what-config_rallye_prices.php:211: // @TODO Rewritings: level->price_level, infos->info in template -./inc/modules/admin/what-config_rallye_prices.php:228: // @TODO Rewrite these two constants +./inc/modules/admin/what-config_admins.php:145: // @TODO Rewrite this to filter 'run_sqls' +./inc/modules/admin/what-config_mods.php:135: // @TODO Rewritings: mod->module in template +./inc/modules/admin/what-config_rallye_prices.php:208: // @TODO Rewritings: level->price_level, infos->info in template +./inc/modules/admin/what-config_rallye_prices.php:225: // @TODO Rewrite these two constants ./inc/modules/admin/what-config_register.php:67: // @TODO Move this HTML code into a template ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country * ./inc/modules/admin/what-email_archiv.php:91: // @TODO Rewrite to SQL_FETCHARRAY() ./inc/modules/admin/what-email_stats.php:47:// @TODO Unused at the moment -./inc/modules/admin/what-extensions.php:351: // @TODO Rewrite this to a filter +./inc/modules/admin/what-extensions.php:344: // @TODO Rewrite this to a filter ./inc/modules/admin/what-guest_add.php:136: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-guest_add.php:68: // @TODO Cant this be rewritten? ./inc/modules/admin/what-guest_add.php:84: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-holiday_list.php:47:// @TODO Unused at the moment ./inc/modules/admin/what-list_autopurge.php:54:// @TODO Rewrite those lines to filter ./inc/modules/admin/what-list_autopurge.php:84: // @TODO Rewritings: surname->surname,family->family in templates -./inc/modules/admin/what-list_beg.php:85: // @TODO Rewrite templates so s/family will be replaced by surname/family -./inc/modules/admin/what-list_beg.php:86: // @TODO to shorten this block. Please also do so with userid->userid ./inc/modules/admin/what-list_cats.php:55: // @TODO No longer needed? define('__CATS_BASE' , "userid,opoints->curr_points,old->refs in template +./inc/modules/admin/what-list_rallyes.php:257: // @TODO Rewritings: opoints->curr_points,old->refs in template ./inc/modules/admin/what-list_sponsor.php:148: // @TODO Rewritings: surname->surname,family->family,ip->remote_addr in template -./inc/modules/admin/what-list_task.php:148: // @TODO Rewrite these templates to one and add $OUT -./inc/modules/admin/what-list_task.php:182: // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template -./inc/modules/admin/what-list_task.php:194: // @TODO Rewrite this to $OUT .= ..., true, ... -./inc/modules/admin/what-list_task.php:198: // @TODO Rewrite this to $OUT .= ..., true, ... +./inc/modules/admin/what-list_task.php:145: // @TODO Rewrite these templates to one and add $OUT +./inc/modules/admin/what-list_task.php:179: // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template +./inc/modules/admin/what-list_task.php:191: // @TODO Rewrite this to $OUT .= ..., true, ... +./inc/modules/admin/what-list_task.php:195: // @TODO Rewrite this to $OUT .= ..., true, ... ./inc/modules/admin/what-list_unconfirmed.php:129: // @TODO Rewritings: userid->userid ./inc/modules/admin/what-list_unconfirmed.php:76: // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS')); ./inc/modules/admin/what-list_unconfirmed.php:87: // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus @@ -122,8 +123,8 @@ ./inc/modules/admin/what-mem_add.php:64: // @TODO Cant this be rewritten? ./inc/modules/admin/what-mem_add.php:80: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-payments.php:151: // @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-unlock_emails.php:101: // @TODO Rewrite these if-blocks to a filter +./inc/modules/admin/what-refbanner.php:139: // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template +./inc/modules/admin/what-unlock_emails.php:91: // @TODO Rewrite these if-blocks to a filter ./inc/modules/admin/what-unlock_sponsor.php:191: // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template ./inc/modules/admin/what-usage.php:87: // @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php ./inc/modules/admin/what-usage.php:98: // @TODO Disabled due to too much trouble @@ -160,19 +161,19 @@ ./inc/modules/member/what-unconfirmed.php:144: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() ./inc/modules/order.php:75: // @TODO Unused: 2,4 ./inc/monthly/monthly_bonus.php:68: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1667: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:1888: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:2208: // @TODO This can be somehow rewritten +./inc/mysql-manager.php:1665: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:1886: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:2206: // @TODO This can be somehow rewritten ./inc/mysql-manager.php:220: // @TODO Nothing helped??? -./inc/mysql-manager.php:2231:// @TODO Fix inconsistency between last_module and getWhat() +./inc/mysql-manager.php:2229:// @TODO Fix inconsistency between last_module and getWhat() ./inc/mysql-manager.php:255: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:576: // @TODO Try to rewrite this to one or more functions -./inc/mysql-manager.php:903:// @TODO Lame description for this function +./inc/mysql-manager.php:901:// @TODO Lame description for this function ./inc/mysql-manager.php:93:// @TODO Can we cache this? ./inc/reset/reset_birthday.php:92: // @TODO 4 is hard-coded here, should we move it out in config? ./inc/wrapper-functions.php:127:// @TODO Implement $compress ./inc/wrapper-functions.php:134:// @TODO Implement $decompress -./inc/wrapper-functions.php:402:// @TODO Do some more sanity check here +./inc/wrapper-functions.php:387:// @TODO Do some more sanity check here ./mailid.php:134: // @TODO Rewrite this to a filter ./mailid.php:214: // @TODO Rewrite this to a dynamic include or so ./mailid.php:94: // @TODO Rewrite this to a filter @@ -185,8 +186,7 @@ ./view.php:72: // @TODO No banner found, output some default banner ### ### DEPRECATION FOLLOWS: ### ### ./inc/modules/admin/admin-inc.php:531:// @DEPRECATED -./templates/de/emails/admins_mail_contct_admin.tpl:1:@DEPRECATED -./templates/de/emails/admins_msg_contct_admin.tpl:1:@DEPRECATED +./inc/modules/admin/what-del_task.php:2:// @DEPRECATED ### ### template-warnings.log follows: ### ### Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in @@ -204,6 +204,7 @@ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : body in templates/de/ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : html in templates/de/html/page_footer.tpl, line: 3 in /home Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl. +Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_uberwach.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_jquery.tpl. diff --git a/inc/modules/admin/what-del_task.php b/inc/modules/admin/what-del_task.php index 9b7860f836..f551ef47b7 100644 --- a/inc/modules/admin/what-del_task.php +++ b/inc/modules/admin/what-del_task.php @@ -1,53 +1,3 @@ diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index acb3c276cf..f8a68348f1 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -107,13 +107,13 @@ ORDER BY // Only unassign / delete tasks when there are selected tasks posted if (isPostRequestElementSet('unassign')) { // Unassign from tasks - foreach (postRequestElement('task') as $id => $sel) { + foreach (postRequestElement('sel') as $id => $sel) { SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1", array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__); } } elseif (isPostRequestElementSet('del')) { // Delete tasks - foreach (postRequestElement('task') as $id => $sel) { + foreach (postRequestElement('sel') as $id => $sel) { if (getRequestElement('type') == 'deleted') { // Delete task immediately SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",