From 81823a24e050ed6a463b2020ebf64fcfdf99d85d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 9 Nov 2009 04:16:59 +0000 Subject: [PATCH] Member login rewritten, TODOs.txt updated --- .gitattributes | 1 - DOCS/TODOs.txt | 51 ++++++---- DOCS/final-checker.sh | 10 +- DOCS/todo-builder.sh | 1 + inc/modules/admin/admin-inc.php | 64 ++++++------- .../html/admin/admin_extensions_installed.tpl | 1 - templates/de/html/guest/guest_login.tpl | 83 ++++------------- .../de/html/guest/guest_nickname_login.tpl | 93 +++++++------------ 8 files changed, 126 insertions(+), 178 deletions(-) delete mode 100644 templates/de/html/admin/admin_extensions_installed.tpl diff --git a/.gitattributes b/.gitattributes index e87d1b8990..2db984e69a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1017,7 +1017,6 @@ templates/de/html/admin/admin_extensions_delete_row.tpl -text templates/de/html/admin/admin_extensions_delete_row_404.tpl -text templates/de/html/admin/admin_extensions_edit.tpl -text templates/de/html/admin/admin_extensions_edit_row.tpl -text -templates/de/html/admin/admin_extensions_installed.tpl -text templates/de/html/admin/admin_extensions_row.tpl -text templates/de/html/admin/admin_extensions_text.tpl -text templates/de/html/admin/admin_footer.tpl -text diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 97436c1aed..4bd1bbb08e 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -55,18 +55,18 @@ ./inc/libs/task_functions.php:244: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:52:// @TODO Move all extension-dependent queries into filters ./inc/libs/user_functions.php:137: // @TODO These two constants are no longer used, maybe we reactivate this code? -./inc/libs/user_functions.php:313: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); -./inc/libs/user_functions.php:336: // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); -./inc/libs/user_functions.php:409: // @TODO We should try to rewrite this to fetchUserData() somehow +./inc/libs/user_functions.php:318: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); +./inc/libs/user_functions.php:341: // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); +./inc/libs/user_functions.php:417: // @TODO We should try to rewrite this to fetchUserData() somehow ./inc/libs/yoomedia_functions.php:64: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script ./inc/load_config.php:76: // @TODO Rewrite them to avoid this else block ./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php * -./inc/modules/admin/admin-inc.php:351: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/modules/admin/admin-inc.php:356: // @TODO ACL is 'allow'... hmmm -./inc/modules/admin/admin-inc.php:422: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/modules/admin/admin-inc.php:428: // @TODO ACL is 'allow'... hmmm -./inc/modules/admin/admin-inc.php:530:// @TODO Try to rewrite this to adminAddMenuSelectionBox() -./inc/modules/admin/admin-inc.php:543: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query +./inc/modules/admin/admin-inc.php:352: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/modules/admin/admin-inc.php:357: // @TODO ACL is 'allow'... hmmm +./inc/modules/admin/admin-inc.php:423: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/modules/admin/admin-inc.php:429: // @TODO ACL is 'allow'... hmmm +./inc/modules/admin/admin-inc.php:531:// @TODO Try to rewrite this to adminAddMenuSelectionBox() +./inc/modules/admin/admin-inc.php:544: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query ./inc/modules/admin/overview-inc.php:160: // @TODO Rewrite this to a filter ./inc/modules/admin/overview-inc.php:274: // @TODO Rewrite this to something with include files and/or filter ./inc/modules/admin/overview-inc.php:312: // @TODO This may also be rewritten to include files @@ -158,14 +158,15 @@ ./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:1566: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:1790: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:2112: // @TODO This can be somehow rewritten -./inc/mysql-manager.php:2135:// @TODO Fix inconsistency between last_module and getWhat() +./inc/mysql-manager.php:1564: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:1788: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:2110: // @TODO This can be somehow rewritten +./inc/mysql-manager.php:2133:// @TODO Fix inconsistency between last_module and getWhat() ./inc/mysql-manager.php:220: // @TODO Nothing helped??? ./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:93:// @TODO Can we cache this? +./inc/reset/reset_beg.php:50:// @TODO This should be converted in a daily beg rallye ./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 @@ -180,9 +181,26 @@ ./mailid_top.php:260: // @TODO Try to rewrite the following unset() ./mailid_top.php:99: // @TODO Rewrite this to a filter ./view.php:72: // @TODO No banner found, output some default banner +./templates/de/html/admin/admin_add_country.tpl:23: +./templates/de/html/admin/admin_admins_contct_form.tpl:3: +./templates/de/html/admin/admin_amenu_edit.tpl:4: +./templates/de/html/admin/admin_config_other.tpl:66: +./templates/de/html/admin/admin_list_autopurge.tpl:2: +./templates/de/html/admin/admin_list_beg.tpl:2: +./templates/de/html/admin/admin_list_bonus.tpl:2: +./templates/de/html/admin/admin_list_mods.tpl:4: +./templates/de/html/admin/admin_list_unconfirmed_list.tpl:3: +./templates/de/html/admin/admin_list_wernis_main.tpl:2: +./templates/de/html/admin/admin_login_form.tpl:35: @TODO Doesn't work with sessions +./templates/de/html/admin/admin_login_form.tpl:38: +./templates/de/html/admin/admin_mods_edit.tpl:3: +./templates/de/html/admin/admin_optimize.tpl:3: +./templates/de/html/guest/guest_login.tpl:21: @TODO Deactivated feature, try to implement it or remove it. +./templates/de/html/guest/guest_nickname_login.tpl:21: @TODO Deactivated feature, try to find a solution for this or remove it. +./templates/de/html/guest/guest_stats_member.tpl:23: @TODO We have to fix these counters. +./templates/de/html/surfbar/surfbar_frame_top.tpl:23:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top2 (wouldn't be easy) ### ### DEPRECATION FOLLOWS: ### ### -./inc/modules/admin/admin-inc.php:531:// @DEPRECATED -./templates/de/html/admin/admin_extensions_installed.tpl:1: +./inc/modules/admin/admin-inc.php:532:// @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 @@ -193,6 +211,7 @@ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/ht Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_welcome_footer.tpl, line: 1 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_welcome_footer.tpl, line: 2 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_welcome_footer.tpl, line: 3 in +Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_doubler.tpl, line: 56 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in Warning: DOMDocument::loadHTMLFile(): Document is empty in templates/de/html/header.tpl, line: 1 in /home Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home @@ -213,7 +232,7 @@ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 12 in -Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_login_form.tpl, line: 49 in +Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_login_form.tpl, line: 51 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 6 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 7 in Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in diff --git a/DOCS/final-checker.sh b/DOCS/final-checker.sh index 4f3acbaa9a..93e39a701e 100755 --- a/DOCS/final-checker.sh +++ b/DOCS/final-checker.sh @@ -9,8 +9,10 @@ if ! test -e "modules.php"; then fi echo "$0: Analyzing..." -echo " - TODOs..." -TODOS=`find -type f -name "*.php" -exec grep "@TODO" {} \; | grep "@" --count` +echo " - TODOs in PHP..." +TODOS_PHP=`find -type f -name "*.php" -exec grep "@TODO" {} \; | grep "@" --count` +echo " - TODOs in TPL..." +TODOS_TPL=`find -type f -name "*.tpl" -exec grep "@TODO" {} \; | grep "@" --count` echo " - DEPRECATED PHP..." DEPRECATED_PHP=`find -type f -name "*.php" -exec grep "@DEPRECATED" {} \; | grep "@" --count` echo " - DEPRECATED TPL..." @@ -19,8 +21,8 @@ echo " - global statements..." GLOBALS=`find -type f -name "*.php" -exec grep -Hn "global " {} \; | grep -v "//" | grep -v "phpmailer" --count` echo "$0: Result..." echo "--------------------------------------" -echo " - Open TODOs: ${TODOS}" -echo " - Open DEPRECATED (PHP/TPL): ${DEPRECATED_PHP}/${DEPRECATED_TPL}" +echo " - Open TODOs: ${TODOS_PHP}/${TODOS_TPL}" +echo " - Open DEPRECATED: ${DEPRECATED_PHP}/${DEPRECATED_TPL}" echo " - global statements: ${GLOBALS}" echo "--------------------------------------" echo "$0: Thanks for waiting for the final release 0.2.1-FINAL! :-)" diff --git a/DOCS/todo-builder.sh b/DOCS/todo-builder.sh index 1bcf8c1aa4..9eb697114b 100755 --- a/DOCS/todo-builder.sh +++ b/DOCS/todo-builder.sh @@ -15,6 +15,7 @@ echo "### WARNING: THIS FILE IS AUTO-GENERATED BY $0 (uid=$UID/user=$USER) ###" echo "### DO NOT EDIT THIS FILE. ###" >> $TODO echo "$0: Searching for @TODO ..." find -type f -name "*.php" -exec grep -Hin "@TODO" {} \; | sort >> $TODO +find -type f -name "*.tpl" -exec grep -Hin "@TODO" {} \; | sort >> $TODO echo "### ### DEPRECATION FOLLOWS: ### ###" >> $TODO echo "$0: Searching for @DEPRECATED ..." find -type f -name "*.php" -exec grep -Hin "@DEPRECATED" {} \; | sort >> $TODO diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index c43101826b..c962ea20bf 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -347,8 +347,8 @@ ORDER BY // Do we have entries? if (SQL_NUMROWS($result_main) > 0) { - $OUT = "
 
\n"; - $OUT .= "'; } // Is there a cache instance again? @@ -502,13 +502,13 @@ function addMemberSelectionBox ($def=0, $add_all=false, $return=false, $none=fal $OUT = ''; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) - if ($add_all === true) $OUT = " \n"; - elseif ($none === true) $OUT = " \n"; + if ($add_all === true) $OUT = ' '; + elseif ($none === true) $OUT = ' '; while ($content = SQL_FETCHARRAY($result)) { - $OUT .= " '; } // END - while // Free memory @@ -523,7 +523,7 @@ function addMemberSelectionBox ($def=0, $add_all=false, $return=false, $none=fal loadTemplate('admin_member_selection_box', false, $content); } else { // Return content in selection frame - return "\n"; + return ''; } } diff --git a/templates/de/html/admin/admin_extensions_installed.tpl b/templates/de/html/admin/admin_extensions_installed.tpl deleted file mode 100644 index 11f5d85d80..0000000000 --- a/templates/de/html/admin/admin_extensions_installed.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl index 5395db35ae..db2ebd6044 100644 --- a/templates/de/html/guest/guest_login.tpl +++ b/templates/de/html/guest/guest_login.tpl @@ -1,42 +1,27 @@ +
- - - - - - - - - - - - + - - - + - $content[message] + - - - - - - - - -
+
+
- - - - - - - - - - - - - + - - - - - - - - + - - - - - - - - - -
+
diff --git a/templates/de/html/guest/guest_nickname_login.tpl b/templates/de/html/guest/guest_nickname_login.tpl index 8ada63981a..58b3b12e01 100644 --- a/templates/de/html/guest/guest_nickname_login.tpl +++ b/templates/de/html/guest/guest_nickname_login.tpl @@ -1,37 +1,27 @@ +
- +
- - - - - - - - - - - - - - - + + + + $content[message] + - - -
+
+
- +
- - - - - - - - - - - - - - - - - - - - - + + - + + - - -
+
-- 2.39.5