Mark as not found when array is closed

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 32d7c03229d0ede434b925e491eac69672990d30..b2913da5d36498346d7b5f889fce6c92fe5d031b 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -6,8 +6,8 @@
 ./cron.php:62:// @TODO Do stuff here
 ./inc/classes/cachesystem.class.php:516:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:150:        // @TODO Make this all better... :-/
-./inc/config-functions.php:326:                                        // @TODO Call setConfigEntry() somehow
-./inc/config-functions.php:354:                // @TODO Call setConfigEntry() somehow
+./inc/config-functions.php:327:                                        // @TODO Call setConfigEntry() somehow
+./inc/config-functions.php:355:                // @TODO Call setConfigEntry() somehow
 ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
 ./inc/daily/daily_birthday.php:107:                    // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/daily/daily_birthday.php:68:// @TODO Rewrite these if() blocks to a filter
@@ -67,16 +67,16 @@
 ./inc/filter/blacklist_filter.php:82:  // @TODO Insert log entry
 ./inc/filter/blacklist_filter.php:93:  // @TODO Insert log entry
 ./inc/filter/bonus_filter.php:56:              // @TODO This query isn't right, it will only update if the user was for a longer time away!
-./inc/filter/cache_filter.php:94:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
 ./inc/filter/forced_filter.php:73:             // @TODO This part is unfinished
 ./inc/filter-functions.php:119:        // @TODO Remove this forced removal after a year or so
 ./inc/filters.php:1380:                // @TODO No banner found, output some default banner
 ./inc/functions.php:1210:                      // @TODO Are these convertions still required?
 ./inc/functions.php:1231:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:1858:      // @TODO Find a way to cache this
-./inc/functions.php:1962:      // @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2166:      // @TODO Rename column data_type to e.g. mail_status
-./inc/functions.php:2516:// @TODO cacheFiles is not yet supported
+./inc/functions.php:1535:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
+./inc/functions.php:1859:      // @TODO Find a way to cache this
+./inc/functions.php:1963:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2167:      // @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:2517:// @TODO cacheFiles is not yet supported
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
 ./inc/install-functions.php:446:       // @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
@@ -207,12 +207,12 @@
 ./inc/modules/order.php:71:            // @TODO Unused: timestamp
 ./inc/monthly/monthly_beg.php:58:      // @TODO Rewrite these if() blocks to a filter
 ./inc/monthly/monthly_bonus.php:57:    // @TODO Rewrite these if() blocks to a filter
-./inc/mysql-manager.php:1509:          // @TODO Rewrite these lines to a filter
-./inc/mysql-manager.php:1533:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1849:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2017:                          // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-./inc/mysql-manager.php:2140:                  // @TODO Used generic 'userid' here
-./inc/mysql-manager.php:2361:// @TODO cacheFiles is not yet supported
+./inc/mysql-manager.php:1511:          // @TODO Rewrite these lines to a filter
+./inc/mysql-manager.php:1535:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1851:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2019:                          // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
+./inc/mysql-manager.php:2142:                  // @TODO Used generic 'userid' here
+./inc/mysql-manager.php:2360:// @TODO cacheFiles is not yet supported
 ./inc/mysql-manager.php:408:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/pool-functions.php:44:// @TODO "Hook" ext-html_mail into this to allow column `html_msg`

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 25f80bc98908ac444cb917908579426931318a17..e468c1747bd06a48d1fb991c7335e488543bf27c 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -259,6 +259,7 @@ function updateOldConfigFile () {
                        // Now check this row
                        if (substr($line, 0, 2) == ');') {
                                // MySQL array is closed so stop looking for it
+                               $found = FALSE;
                                break;
                        } elseif (substr($line, 0, 2) == '//') {
                                // Skip this line