Member login rewritten, TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index e87d1b899086db27432e0b7646caa2e519cdbd03..2db984e69aaeba201616bc5bbc76ff352c52f7c7 100644 (file)
--- 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_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
 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 97436c1aed4d1b671b817bfc2fd1f32379571231..4bd1bbb08eec089b57697edce67290e40d6fd216 100644 (file)
--- 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/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/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
 ./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/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/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
 ./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
 ./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:                    <!-- @TODO Rewrite this selection box to our generic functions //-->
+./templates/de/html/admin/admin_admins_contct_form.tpl:3:      <!-- @TODO Shouldn't we add a title here? //-->
+./templates/de/html/admin/admin_amenu_edit.tpl:4:<!-- @TODO Shouldn't we add a title here? //-->
+./templates/de/html/admin/admin_config_other.tpl:66:                   <!-- @TODO Rewrite this selection to one of our functions //-->
+./templates/de/html/admin/admin_list_autopurge.tpl:2:  <!-- @TODO Shouldn't we add a title here? //-->
+./templates/de/html/admin/admin_list_beg.tpl:2:        <!-- @TODO No title here? //-->
+./templates/de/html/admin/admin_list_bonus.tpl:2:      <!-- @TODO No title here? //-->
+./templates/de/html/admin/admin_list_mods.tpl:4:       <!-- @TODO Shouldn't we add a title here? //-->
+./templates/de/html/admin/admin_list_unconfirmed_list.tpl:3:<!-- @TODO Shouldn't we add a title here? //-->
+./templates/de/html/admin/admin_list_wernis_main.tpl:2:<!-- @TODO No title here? //-->
+./templates/de/html/admin/admin_login_form.tpl:35:     @TODO Doesn't work with sessions
+./templates/de/html/admin/admin_login_form.tpl:38:             <!-- @TODO Try to move the select box to our generic functions //-->
+./templates/de/html/admin/admin_mods_edit.tpl:3:       <!-- @TODO Shouldn't we add a title here? //-->
+./templates/de/html/admin/admin_optimize.tpl:3:        <!-- @TODO Shouldn't we add a title here? //-->
+./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: ### ###
 ### ### DEPRECATION FOLLOWS: ### ###

-./inc/modules/admin/admin-inc.php:531:// @DEPRECATED
-./templates/de/html/admin/admin_extensions_installed.tpl:1:<!-- @DEPRECATED //-->
+./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 
 ### ### 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 : 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
 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 : 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 
 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 4f3acbaa9a00f46f30116c57365bcd8552824a5e..93e39a701e367ef0f36d3f0467f73c5b91f23db1 100755 (executable)
--- a/DOCS/final-checker.sh
+++ b/DOCS/final-checker.sh
@@ -9,8 +9,10 @@ if ! test -e "modules.php"; then
 fi
 
 echo "$0: Analyzing..."
 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..."
 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 "--------------------------------------"
 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! :-)"
 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 1bcf8c1aa4968c32266881d2086f2d110dd6478a..9eb697114bbe60c348dd8f906d56a7eb6368e7cd 100755 (executable)
--- 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
 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
 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 c43101826b69b249db598a5e4fd66fa428a6d43c..c962ea20bf9a25003b127e37257c50944bf7bf06 100644 (file)
--- 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) {
 
        // Do we have entries?
        if (SQL_NUMROWS($result_main) > 0) {

-               $OUT = "<div style=\"height:7px\" class=\"seperator\">&nbsp;</div>\n";
-               $OUT .= "<ul class=\"admin_menu_main\">\n";
+               $OUT  = '<div style="height:7px" class="seperator">&nbsp;</div>';
+               $OUT .= '<ul class="admin_menu_main">';

                // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
                        if ((isExtensionActive('admins')) && (getExtensionVersion('admins') > '0.2.0')) {
                // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
                        if ((isExtensionActive('admins')) && (getExtensionVersion('admins') > '0.2.0')) {


@@ -370,33 +370,33 @@ ORDER BY
                                        $GLOBALS['menu']['title'][$menu]      = $title;
                                        $GLOBALS['menu']['description'][$menu] = $descr;
                                }
                                        $GLOBALS['menu']['title'][$menu]      = $title;
                                        $GLOBALS['menu']['description'][$menu] = $descr;
                                }

-                               $OUT .= "<li class=\"admin_menu\">
-<div class=\"nobr\"><strong>&middot;</strong>&nbsp;";
+                               $OUT .= '<li class="admin_menu">
+<div class="nobr"><strong>&middot;</strong>&nbsp;';

 
                                if ($readable === true) {
                                        if (($menu == $action) && (empty($what))) {
 
                                if ($readable === true) {
                                        if (($menu == $action) && (empty($what))) {

-                                               $OUT .= "<strong>";
+                                               $OUT .= '<strong>';

                                        } else {
                                        } else {

-                                               $OUT .= "[<a href=\"{?URL?}/modules.php?module=admin&amp;action=".$menu."\">";
+                                               $OUT .= '[<a href="{?URL?}/modules.php?module=admin&amp;action=' . $menu . '">';

                                        }
                                } else {
                                        }
                                } else {

-                                       $OUT .= "<em style=\"cursor:help\" class=\"admin_note\" title=\"{--MENU_ACTION_404--}\">";
+                                       $OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_ACTION_404--}">';

                                }
 
                                $OUT .= $title;
 
                                if ($readable === true) {
                                        if (($menu == $action) && (empty($what))) {
                                }
 
                                $OUT .= $title;
 
                                if ($readable === true) {
                                        if (($menu == $action) && (empty($what))) {

-                                               $OUT .= "</strong>";
+                                               $OUT .= '</strong>';

                                        } else {
                                        } else {

-                                               $OUT .= "</a>]";
+                                               $OUT .= '</a>]';

                                        }
                                } else {
                                        }
                                } else {

-                                       $OUT .= "</em>";
+                                       $OUT .= '</em>';

                                }
 
                                }
 

-                               $OUT .= "</div>
-</li>\n";
+                               $OUT .= '</div>
+</li>';

 
                                // Check for menu entries
                                $result_what = SQL_QUERY_ESC("SELECT
 
                                // Check for menu entries
                                $result_what = SQL_QUERY_ESC("SELECT


@@ -419,7 +419,7 @@ ORDER BY
                                if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
                                        $GLOBALS['menu']['description'] = array();
                                        $GLOBALS['menu']['title'] = array(); $SUB = true;
                                if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
                                        $GLOBALS['menu']['description'] = array();
                                        $GLOBALS['menu']['title'] = array(); $SUB = true;

-                                       $OUT .= "<li class=\"admin_menu_sub\"><ul class=\"admin_menu_sub\">\n";
+                                       $OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';

                                        // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                                        while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
                                                // Check for access level
                                        // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                                        while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
                                                // Check for access level


@@ -441,47 +441,47 @@ ORDER BY
                                                        // Insert compiled title and description
                                                        $GLOBALS['menu']['title'][$what_sub]      = $title_what;
                                                        $GLOBALS['menu']['description'][$what_sub] = $desc_what;
                                                        // Insert compiled title and description
                                                        $GLOBALS['menu']['title'][$what_sub]      = $title_what;
                                                        $GLOBALS['menu']['description'][$what_sub] = $desc_what;

-                                                       $OUT .= "<li class=\"admin_menu\">
-               <div class=\"nobr\"><strong>--&gt;</strong>&nbsp;";
+                                                       $OUT .= '<li class="admin_menu">
+<div class="nobr"><strong>--&gt;</strong>&nbsp;';

                                                        if ($readable === true) {
                                                                if ($what == $what_sub) {
                                                        if ($readable === true) {
                                                                if ($what == $what_sub) {

-                                                                       $OUT .= "<strong>";
+                                                                       $OUT .= '<strong>';

                                                                } else {
                                                                } else {

-                                                                       $OUT .= "[<a href=\"{?URL?}/modules.php?module=admin&amp;what=".$what_sub."\">";
+                                                                       $OUT .= '[<a href="{?URL?}/modules.php?module=admin&amp;what=' . $what_sub . '">';

                                                                }
                                                        } else {
                                                                }
                                                        } else {

-                                                               $OUT .= "<em style=\"cursor:help\" class=\"admin_note\" title=\"{--MENU_WHAT_404--}\">";
+                                                               $OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_WHAT_404--}">';

                                                        }
 
                                                        $OUT .= $title_what;
 
                                                        if ($readable === true) {
                                                                if ($what == $what_sub) {
                                                        }
 
                                                        $OUT .= $title_what;
 
                                                        if ($readable === true) {
                                                                if ($what == $what_sub) {

-                                                                       $OUT .= "</strong>";
+                                                                       $OUT .= '</strong>';

                                                                } else {
                                                                } else {

-                                                                       $OUT .= "</a>]";
+                                                                       $OUT .= '</a>]';

                                                                }
                                                        } else {
                                                                }
                                                        } else {

-                                                               $OUT .= "</em>";
+                                                               $OUT .= '</em>';

                                                        }
                                                        }

-                                                       $OUT .= "</div>
-</li>\n";
+                                                       $OUT .= '</div>
+</li>';

                                                } // END - if
                                        } // END - while
 
                                        // Free memory
                                        SQL_FREERESULT($result_what);
                                                } // END - if
                                        } // END - while
 
                                        // Free memory
                                        SQL_FREERESULT($result_what);

-                                       $OUT .= "</ul>
-</li>\n";
+                                       $OUT .= '</ul>
+</li>';

                                } // END - if
 
                                } // END - if
 

-                               $OUT .= "<li style=\"height:7px\" class=\"seperator\">&nbsp;</li>\n";
+                               $OUT .= '<li style="height:7px" class="seperator">&nbsp;</li>';

                        } // END - if
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
                        } // END - if
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);

-               $OUT .= "</ul>\n";
+               $OUT .= '</ul>';

        }
 
        // Is there a cache instance again?
        }
 
        // 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 ;-) )
        $OUT = '';
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )

-       if ($add_all === true)   $OUT = "      <option value=\"all\">{--ALL_MEMBERS--}</option>\n";
-        elseif ($none === true) $OUT = "      <option value=\"0\">{--SELECT_NONE--}</option>\n";
+       if ($add_all === true)   $OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
+        elseif ($none === true) $OUT = '      <option value="0">{--SELECT_NONE--}</option>';

 
        while ($content = SQL_FETCHARRAY($result)) {
 
        while ($content = SQL_FETCHARRAY($result)) {

-               $OUT .= "      <option value=\"".bigintval($content['userid'])."\"";
+               $OUT .= '      <option value="' . bigintval($content['userid']) . '"';

                if ($def == $content['userid']) $OUT .= ' selected="selected"';
                if ($def == $content['userid']) $OUT .= ' selected="selected"';

-               $OUT .= ">".$content['surname']." ".$content['family']." (".bigintval($content['userid']).")</option>\n";
+               $OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';

        } // END - while
 
        // Free memory
        } // 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
                loadTemplate('admin_member_selection_box', false, $content);
        } else {
                // Return content in selection frame

-               return "<select class=\"admin_select\" name=\"".$field."\" size=\"1\">\n".$OUT."</select>\n";
+               return '<select class="admin_select" name="' . $field . '" size="1">' . $OUT . '</select>';

        }
 }
 
        }
 }
 

diff --git a/templates/de/html/admin/admin_extensions_installed.tpl b/templates/de/html/admin/admin_extensions_installed.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_extensions_installed.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->

diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl
index 5395db35aeaedc3f02a710fd13a2aa10e6746f57..db2ebd60446ddd41d1c3f3502ab63e2c9674eeb4 100644 (file)
--- a/templates/de/html/guest/guest_login.tpl
+++ b/templates/de/html/guest/guest_login.tpl
@@ -1,42 +1,27 @@
+<div align="center">

 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed" width="480">
        <tr>
 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed" width="480">
        <tr>

-               <td colspan="9" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="7" align="center" class="guest_login_header">
+               <td colspan="4" align="center" class="guest_login_header">

                        <strong>{--GUEST_WELCOME_MEMBER--}</strong>
                </td>
                        <strong>{--GUEST_WELCOME_MEMBER--}</strong>
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="9" height="3" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="80" align="right">{--GUEST_ENTER_LOGIN--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
+               <td align="right">{--GUEST_ENTER_LOGIN--}:</td>

                <td>
                        <input type="text" name="id" class="guest_normal" size="4" maxlength="9" />
                </td>
                <td>
                        <input type="text" name="id" class="guest_normal" size="4" maxlength="9" />
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="80" align="right">{--GUEST_ENTER_PASSWORD--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
+               <td align="right">{--GUEST_ENTER_PASSWORD--}:</td>

                <td>
                        <input type="password" name="password" class="guest_normal" size="10" maxlength="255" />
                </td>
                <td>
                        <input type="password" name="password" class="guest_normal" size="10" maxlength="255" />
                </td>

-               <td width="10" class="seperator">&nbsp;</td>

        </tr>
        $content[message]
        </tr>
        $content[message]

+       <!--
+       @TODO Deactivated feature, try to implement it or remove it.

        <tr>
        <tr>

-               <td colspan="9" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="3" align="right">{--GUEST_SELECT_LIFETIME--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="3"><select name="lifetime" size="1"
+               <td colspan="2" align="right">{--GUEST_SELECT_LIFETIME--}:</td>
+               <td colspan="2"><select name="lifetime" size="1"

                        class="guest_select">
                        <option value="3600">1 {--LIFE_HOURS--}</option>
                        <option value="7200">2 {--LIFE_HOURS--}</option>
                        class="guest_select">
                        <option value="3600">1 {--LIFE_HOURS--}</option>
                        <option value="7200">2 {--LIFE_HOURS--}</option>


@@ -52,74 +37,44 @@
                        <option value="31536000">1 {--LIFE_YEARS--}</option>
                        <option value="60">{--LIFE_CLOSE_BROWSER--}</option>
                </select></td>
                        <option value="31536000">1 {--LIFE_YEARS--}</option>
                        <option value="60">{--LIFE_CLOSE_BROWSER--}</option>
                </select></td>

-               <td width="10" class="seperator">&nbsp;</td>

        </tr>
        </tr>

+       //-->

        <tr>
        <tr>

-               <td colspan="9" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="7" align="center">
+               <td class="guest_footer" colspan="4" align="center">

                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="guest_submit" value="{--LOGIN_SUBMIT--}" />
                </td>
                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="guest_submit" value="{--LOGIN_SUBMIT--}" />
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="9" height="3" class="seperator">&nbsp;</td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

 
 

+<div align="center">

 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed">
        <tr>
 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed">
        <tr>

-               <td colspan="5" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="3" align="center" class="guest_login_header">
+               <td colspan="2" align="center" class="guest_login_header">

                        <strong>{--GUEST_GET_NEW_PASS--}</strong>
                </td>
                        <strong>{--GUEST_GET_NEW_PASS--}</strong>
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="3" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145" align="right">{--GUEST_ENTER_LOGIN--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145">
+               <td align="right">{--GUEST_ENTER_LOGIN--}:</td>
+               <td>

                        <input type="text" name="id" class="guest_normal" size="4" maxlength="9" />&nbsp;&nbsp;<strong>{--_OR--}</strong>
                </td>
                        <input type="text" name="id" class="guest_normal" size="4" maxlength="9" />&nbsp;&nbsp;<strong>{--_OR--}</strong>
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="3" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145" align="right">{--GUEST_ENTER_EMAIL--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145">
+               <td align="right">{--GUEST_ENTER_EMAIL--}:</td>
+               <td>

                        <input type="text" name="email" class="guest_normal" size="20" maxlength="255" />
                </td>
                        <input type="text" name="email" class="guest_normal" size="20" maxlength="255" />
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="9" height="3" class="seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="7" align="center">
+               <td colspan="2" align="center" class="guest_footer">

                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="new_pass" class="guest_submit" value="{--NEW_PASSWD--}" />
                </td>
                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="new_pass" class="guest_submit" value="{--NEW_PASSWD--}" />
                </td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="3" class="seperator">&nbsp;</td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

diff --git a/templates/de/html/guest/guest_nickname_login.tpl b/templates/de/html/guest/guest_nickname_login.tpl
index 8ada63981ad9be2524ea9687f56cdd53bdbcad82..58b3b12e011085b50759a37f2c07019957c20c7e 100644 (file)
--- a/templates/de/html/guest/guest_nickname_login.tpl
+++ b/templates/de/html/guest/guest_nickname_login.tpl
@@ -1,37 +1,27 @@
+<div align="center">

 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">
 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">

-<table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="540">
+<table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed" width="540">

        <tr>
        <tr>

-               <td width="10" class="guest_title2 bottom2 seperator" height="30">&nbsp;</td>
-               <td colspan="7" class="guest_title2 bottom2">
+               <td colspan="4" class="guest_login_header">

                        <strong>{--GUEST_WELCOME_MEMBER--}</strong>
                </td>
                        <strong>{--GUEST_WELCOME_MEMBER--}</strong>
                </td>

-               <td width="10" class="guest_title2 bottom2 seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="9" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="180" align="right">{--GUEST_ENTER_LOGIN_NICKNAME--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="text" name="id" class="guest_normal" size="10"
-                       maxlength="255"></td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="80" align="right">{--GUEST_ENTER_PASSWORD--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td><input type="password" name="password" class="guest_normal"
-                       size="10" maxlength="255"></td>
-               <td width="10" class="seperator">&nbsp;</td>
+               <td align="right">{--GUEST_ENTER_LOGIN_NICKNAME--}:</td>
+               <td>
+                       <input type="text" name="id" class="guest_normal" size="10" maxlength="255" />
+               </td>
+               <td align="right">{--GUEST_ENTER_PASSWORD--}:</td>
+               <td>
+                       <input type="password" name="password" class="guest_normal" size="10" maxlength="255" />
+               </td>

        </tr>
        $content[message]
        </tr>
        $content[message]

+       <!--
+       @TODO Deactivated feature, try to find a solution for this or remove it.

        <tr>
        <tr>

-               <td colspan="9" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="3" align="right">{--GUEST_SELECT_LIFETIME--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td colspan="3"><select name="lifetime" size="1"
+               <td colspan="2" align="right">{--GUEST_SELECT_LIFETIME--}:</td>
+               <td colspan="2"><select name="lifetime" size="1"

                        class="guest_select">
                        <option value="3600">1 {--LIFE_HOURS--}</option>
                        <option value="8200">2 {--LIFE_HOURS--}</option>
                        class="guest_select">
                        <option value="3600">1 {--LIFE_HOURS--}</option>
                        <option value="8200">2 {--LIFE_HOURS--}</option>


@@ -47,62 +37,45 @@
                        <option value="31536000">1 {--LIFE_YEARS--}</option>
                        <option value="60">{--LIFE_CLOSE_BROWSER--}</option>
                </select></td>
                        <option value="31536000">1 {--LIFE_YEARS--}</option>
                        <option value="60">{--LIFE_CLOSE_BROWSER--}</option>
                </select></td>

-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="9" height="3" class="bottom2 seperator">&nbsp;</td>

        </tr>
        </tr>

+       //-->

        <tr>
        <tr>

-               <td width="10" class="guest_footer seperator">&nbsp;</td>
-               <td colspan="7" align="center" class="guest_footer">
+               <td colspan="4" align="center" class="guest_footer">

                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="guest_submit" value="{--LOGIN_SUBMIT--}" />
                </td>
                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="guest_submit" value="{--LOGIN_SUBMIT--}" />
                </td>

-               <td width="10" class="guest_footer seperator">&nbsp;</td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>

 
 

+<div align="center">

 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">
 <form accept-charset="utf-8" action="{?URL?}/modules.php?module=index&amp;what=login" method="post" style="margin-bottom: 0px">

-<table border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="540">
+<table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed" width="540">

        <tr>
        <tr>

-               <td width="10" class="guest_title2 bottom2 seperator">&nbsp;</td>
-               <td colspan="3" class="guest_title2 bottom2" height="30"><strong>{--GUEST_GET_NEW_PASS--}</strong>
+               <td colspan="2" class="guest_login_header" height="30">
+                       <strong>{--GUEST_GET_NEW_PASS--}</strong>

                </td>
                </td>

-               <td width="10" class="guest_title2 bottom2 seperator">&nbsp;</td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="5" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145" align="right">{--GUEST_ENTER_LOGIN_NICKNAME--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145"><input type="text" name="id" class="guest_normal"
-                       size="10" maxlength="255">&nbsp;&nbsp;<strong>{--_OR--}</strong></td>
-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="3" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145" align="right">{--GUEST_ENTER_EMAIL--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td width="145"><input type="text" name="email"
-                       class="guest_normal" size="20" maxlength="255"></td>
-               <td width="10" class="seperator">&nbsp;</td>
+               <td align="right">{--GUEST_ENTER_LOGIN_NICKNAME--}:</td>
+               <td>
+                       <input type="text" name="id" class="guest_normal" size="10" maxlength="255" />
+                       <strong>{--_OR--}</strong>
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td colspan="5" height="3" class="bottom2 seperator">&nbsp;</td>
+               <td align="right">{--GUEST_ENTER_EMAIL--}:</td>
+               <td>
+                       <input type="text" name="email" class="guest_normal" size="20" maxlength="255" />
+               </td>

        </tr>
        <tr>
        </tr>
        <tr>

-               <td width="10" class="guest_footer seperator">&nbsp;</td>
-               <td colspan="3" align="center" class="guest_footer">
+               <td colspan="2" align="center" class="guest_footer">

                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="new_pass" class="guest_submit" value="{--NEW_PASSWD--}" />
                </td>
                        <input type="reset" class="guest_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="new_pass" class="guest_submit" value="{--NEW_PASSWD--}" />
                </td>

-               <td width="10" class="guest_footer seperator">&nbsp;</td>

        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>