Parser error fixed and should be span instead of div, TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 237195577f4f6e7c3f63420328a9b20a9fad9dd3..8225c9e087eb824365f409aac3d1e2d6d8afe994 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -1,15 +1,15 @@
-### WARNING: THIS FILE IS AUTO-GENERATED BY DOCS/todo-builder.sh ###
+### WARNING: THIS FILE IS AUTO-GENERATED BY DOCS/todo-builder.sh (1000/quix0r) ###

 ### DO NOT EDIT THIS FILE. ###
 ./beg.php:193:                         // @TODO Opps, what is missing here???
 ./inc/cache/config-local.php:117:// @TODO Rewrite the following three constants, somehow...
 ./inc/config-functions.php:182:        // @TODO Make this all better... :-/
 ./inc/config-functions.php:207:        // @TODO Rewrite these all to config entries, if somehow possible
 ### DO NOT EDIT THIS FILE. ###
 ./beg.php:193:                         // @TODO Opps, what is missing here???
 ./inc/cache/config-local.php:117:// @TODO Rewrite the following three constants, somehow...
 ./inc/config-functions.php:182:        // @TODO Make this all better... :-/
 ./inc/config-functions.php:207:        // @TODO Rewrite these all to config entries, if somehow possible

-./inc/extensions.php:355:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions.php:431:              // @TODO Extension is loaded, what next?

 ./inc/extensions/ext-sql_patches.php:705:                                              // @TODO Rewrite this to a filter!
 ./inc/extensions/ext-sql_patches.php:743:                                      // @TODO Can we remove this? setConfigEntry('verbose_sql'        , 'N');
 ./inc/extensions/ext-sql_patches.php:93:               /* @TODO SQL_ALTER_TABLE() should work now properly
 ./inc/extensions/ext-surfbar.php:237:                          // @TODO Set some constants we need???
 ./inc/extensions/ext-sql_patches.php:705:                                              // @TODO Rewrite this to a filter!
 ./inc/extensions/ext-sql_patches.php:743:                                      // @TODO Can we remove this? setConfigEntry('verbose_sql'        , 'N');
 ./inc/extensions/ext-sql_patches.php:93:               /* @TODO SQL_ALTER_TABLE() should work now properly
 ./inc/extensions/ext-surfbar.php:237:                          // @TODO Set some constants we need???

+./inc/extensions.php:355:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions.php:431:              // @TODO Extension is loaded, what next?

 ./inc/functions.php:1221:      // @TODO Rewrite this unnice code
 ./inc/functions.php:1282:      // @TODO Remove this if() block if all is working fine
 ./inc/functions.php:1582:              // @TODO This can be, somehow, rewritten
 ./inc/functions.php:1221:      // @TODO Rewrite this unnice code
 ./inc/functions.php:1282:      // @TODO Remove this if() block if all is working fine
 ./inc/functions.php:1582:              // @TODO This can be, somehow, rewritten


@@ -24,12 +24,12 @@
 ./inc/functions.php:2802:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/functions.php:463:// @TODO Rewrite this to an extension 'smtp'
 ./inc/install-inc.php:20: * @TODO Rewrite all constants in this include file                     *
 ./inc/functions.php:2802:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/functions.php:463:// @TODO Rewrite this to an extension 'smtp'
 ./inc/install-inc.php:20: * @TODO Rewrite all constants in this include file                     *

-./inc/language-functions.php:45:// @TODO Rewrite all language constants to this function.

 ./inc/language/de.php:1157:// @TODO Rewrite these two constants
 ./inc/language/de.php:1173:// @TODO Rewrite these five constants
 ./inc/language/de.php:756:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used.
 ./inc/language/de.php:855:// @TODO Are these constants still used?
 ./inc/language/de.php:866:// @TODO Are these constants longer used?
 ./inc/language/de.php:1157:// @TODO Rewrite these two constants
 ./inc/language/de.php:1173:// @TODO Rewrite these five constants
 ./inc/language/de.php:756:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used.
 ./inc/language/de.php:855:// @TODO Are these constants still used?
 ./inc/language/de.php:866:// @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:110:// @TODO Rewrite following two lines to one
 ./inc/language/refback_de.php:46:// @TODO Rewrite these constants to one
 ./inc/language/holiday_de.php:49:// @TODO Rewrite these two constants to one
 ./inc/language/rallye_de.php:110:// @TODO Rewrite following two lines to one
 ./inc/language/refback_de.php:46:// @TODO Rewrite these constants to one


@@ -54,8 +54,6 @@
 ./inc/load_config.php:77:      // @TODO Rewrite them to avoid this else block
 ./inc/load_extensions.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
 ./inc/mails/birthday_mails.php:85:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/load_config.php:77:      // @TODO Rewrite them to avoid this else block
 ./inc/load_extensions.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
 ./inc/mails/birthday_mails.php:85:                     // @TODO 4 is hard-coded here, should we move it out in config?

-./inc/modules/admin.php:257:   // @TODO Rewrite all these constants
-./inc/modules/admin.php:95:                                    // @TODO Why is this set to 'done'?

 ./inc/modules/admin/admin-inc.php:343:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:390:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:504:         // @TODO Rewrite these both constants
 ./inc/modules/admin/admin-inc.php:343:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:390:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:504:         // @TODO Rewrite these both constants


@@ -67,6 +65,8 @@
 ./inc/modules/admin/overview-inc.php:291:                                              // @TODO This may also be rewritten to include files
 ./inc/modules/admin/overview-inc.php:293:                                                      default: // @TODO Unknown support mode
 ./inc/modules/admin/overview-inc.php:444:                      // @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template
 ./inc/modules/admin/overview-inc.php:291:                                              // @TODO This may also be rewritten to include files
 ./inc/modules/admin/overview-inc.php:293:                                                      default: // @TODO Unknown support mode
 ./inc/modules/admin/overview-inc.php:444:                      // @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template

+./inc/modules/admin.php:257:   // @TODO Rewrite all these constants
+./inc/modules/admin.php:95:                                    // @TODO Why is this set to 'done'?

 ./inc/modules/admin/what-add_points.php:120:                   // @TODO Rewrite these both constants
 ./inc/modules/admin/what-add_points.php:54:            // @TODO Rewrite this constant
 ./inc/modules/admin/what-admin_add.php:120:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-add_points.php:120:                   // @TODO Rewrite these both constants
 ./inc/modules/admin/what-add_points.php:54:            // @TODO Rewrite this constant
 ./inc/modules/admin/what-admin_add.php:120:                            // @TODO This can be somehow rewritten to a function

diff --git a/DOCS/todo-builder.sh b/DOCS/todo-builder.sh
index cabf20a408d5cbb5cecda7934f759dd642e0b1d8..3f238d7ae1e42b2fac01852e019315236b4cf398 100644 (file)
--- a/DOCS/todo-builder.sh
+++ b/DOCS/todo-builder.sh
@@ -8,11 +8,13 @@ if ! test -e "modules.php"; then
   exit 1
 fi
 
   exit 1
 fi
 

-echo "$0: Generating TODOs.txt..."
-echo "### WARNING: THIS FILE IS AUTO-GENERATED BY $0 ###" > DOCS/TODOs.txt
+echo "$0: Generating TODOs.txt ..."
+echo "### WARNING: THIS FILE IS AUTO-GENERATED BY $0 ($UID/$USER) ###" > DOCS/TODOs.txt

 echo "### DO NOT EDIT THIS FILE. ###" >> DOCS/TODOs.txt
 echo "### DO NOT EDIT THIS FILE. ###" >> DOCS/TODOs.txt

+echo "$0: Searching for @TODO ..."

 find -type f -name "*.php" -exec grep -Hin "@TODO" {} \; | sort >> DOCS/TODOs.txt
 echo "### ### DEPRECATION FOLLOWS: ### ###" >> DOCS/TODOs.txt
 find -type f -name "*.php" -exec grep -Hin "@TODO" {} \; | sort >> DOCS/TODOs.txt
 echo "### ### DEPRECATION FOLLOWS: ### ###" >> DOCS/TODOs.txt

+echo "$0: Searching for @DEPRECATED ..."

 find -type f -name "*.php" -exec grep -Hin "@DEPRECATED" {} \; | sort >> DOCS/TODOs.txt
 echo "$0: Done."
 exit 0
 find -type f -name "*.php" -exec grep -Hin "@DEPRECATED" {} \; | sort >> DOCS/TODOs.txt
 echo "$0: Done."
 exit 0

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 3e7d980cf3de366f3c809b6cf329ee874b16d497..b0230f73da0c61642dfb015e50fa3cc78599c8ab 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -49,7 +49,7 @@ function registerMustFillout () {
 
        while ($content = SQL_FETCHARRAY($result)) {
                $value = '';
 
        while ($content = SQL_FETCHARRAY($result)) {
                $value = '';

-               if ($content['field_required'] == 'Y') $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
+               if ($content['field_required'] == 'Y') $value = "<span class=\\\"guest_failed\\\">&nbsp;(*)</span>";

                // @TODO Rewrite these constants
                $eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");";
                eval($eval);
                // @TODO Rewrite these constants
                $eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");";
                eval($eval);


@@ -60,10 +60,10 @@ function registerMustFillout () {
 
        // Also fill other constants
        // @TODO Rewrite these constants, too
 
        // Also fill other constants
        // @TODO Rewrite these constants, too

-       define('MUST_GENDER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
-       define('MUST_ADDY'  , "<div class=\"guest_failed\">&nbsp;(*)</div>");
-       define('MUST_BIRTH' , "<div class=\"guest_failed\">&nbsp;(*)</div>");
-       define('MUST_MARKER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
+       define('MUST_GENDER', "<span class=\"guest_failed\">&nbsp;(*)</span>");
+       define('MUST_ADDY'  , "<span class=\"guest_failed\">&nbsp;(*)</span>");
+       define('MUST_BIRTH' , "<span class=\"guest_failed\">&nbsp;(*)</span>");
+       define('MUST_MARKER', "<span class=\"guest_failed\">&nbsp;(*)</span>");

 }
 
 //
 }
 
 //


@@ -123,7 +123,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 
        // Look for categories
        $result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort` ASC",
 
        // Look for categories
        $result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort` ASC",

-       __FUNCTION__, __LINE__);
+               __FUNCTION__, __LINE__);

 
        if (SQL_NUMROWS($result) > 0) {
                // List alle visible modules (or all to the admin)
 
        if (SQL_NUMROWS($result) > 0) {
                // List alle visible modules (or all to the admin)

diff --git a/inc/request-functions.php b/inc/request-functions.php
index b720ffc2d37589018fe592ee9eece8671f555f10..c50fa5558c209e13fa26a795163c1473ff6f02b7 100644 (file)
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -163,12 +163,13 @@ function REQUEST_POST_COUNT () {
 
 // Setter for element in $_POST
 function REQUEST_SET_POST ($element, $value) {
 
 // Setter for element in $_POST
 function REQUEST_SET_POST ($element, $value) {

+       // Is $element or $value an array?

        if (is_array($element)) {
                // Set array
                $eval = "\$_POST['";
 
                // Add all entries
        if (is_array($element)) {
                // Set array
                $eval = "\$_POST['";
 
                // Add all entries

-               $eval .= implode("', '", $element);
+               $eval .= implode("']['", $element);

 
                // Finish eval() command
                $eval .= sprintf("'] = \"%s\";", SQL_ESCAPE($value));
 
                // Finish eval() command
                $eval .= sprintf("'] = \"%s\";", SQL_ESCAPE($value));