final-checker.sh extended with search for global statements

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 19370da966c8ec6fc92c4bdaad61271981aaac4c..75e32586196ff1c574ca2ccd8ac9d05851e4a360 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -1,29 +1,29 @@
 ### WARNING: THIS FILE IS AUTO-GENERATED BY DOCS/todo-builder.sh ###
 ### DO NOT EDIT THIS FILE. ###
 ./beg.php:196:                         // @TODO Opps, what is missing here???
 ### WARNING: THIS FILE IS AUTO-GENERATED BY DOCS/todo-builder.sh ###
 ### DO NOT EDIT THIS FILE. ###
 ./beg.php:196:                         // @TODO Opps, what is missing here???

-./inc/extensions/ext-sql_patches.php:755:                      // @TODO Rewrite this to a filter!
-./inc/extensions/ext-sql_patches.php:793:              // @TODO Can we remove this? setConfigEntry('verbose_sql'        , "N");
-./inc/extensions/ext-sql_patches.php:95:       /* @TODO SQL_ALTER_TABLE() should work now properly
+./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.php:324:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions.php:400:              // @TODO Extension is loaded, what next?
 ./inc/extensions.php:324:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions.php:400:              // @TODO Extension is loaded, what next?

-./inc/functions.php:1229:      // @TODO Rewrite this unnice code
-./inc/functions.php:1290:      // @TODO Remove this if() block if all is working fine
-./inc/functions.php:1590:              // @TODO This can be, somehow, rewritten
-./inc/functions.php:2315:// @TODO Rewrite all language constants to this function.
-./inc/functions.php:246:                       // @TODO Fine all templates which are using these direct variables and rewrite them.
-./inc/functions.php:247:                       // @TODO After this step is done, this else-block is history
-./inc/functions.php:2563:                      $GLOBALS['cache_instance']->destroyCacheFile(); // @TODO isn't it better to do $GLOBALS['cache_instance']->destroyCacheFile('revision')?
-./inc/functions.php:2565:                      // @TODO shouldn't do the unset and the reloading $GLOBALS['cache_instance']->destroyCacheFile() Or a new methode like forceCacheReload('revision')?
-./inc/functions.php:2637:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
-./inc/functions.php:2749:              // @TODO Add a little more infos here
-./inc/functions.php:2760:      // @TODO This cannot be rewritten to mxchange_die(), try to find a solution for this.
-./inc/functions.php:2865:// @TODO Implement $compress
-./inc/functions.php:2872:// @TODO Implement $decompress
-./inc/functions.php:2975:      // @TODO We may want to switch over to UTF-8 here!
-./inc/functions.php:2983:// @TODO Rewrite this function to use READ_FILE() and WRITE_FILE()
-./inc/functions.php:462:// @TODO Rewrite this to an extension 'smtp'
-./inc/language/de.php:1154:// @TODO Rewrite these two constants
-./inc/language/de.php:1170:// @TODO Rewrite these five constants
+./inc/functions.php:1232:      // @TODO Rewrite this unnice code
+./inc/functions.php:1293:      // @TODO Remove this if() block if all is working fine
+./inc/functions.php:1593:              // @TODO This can be, somehow, rewritten
+./inc/functions.php:2321:// @TODO Rewrite all language constants to this function.
+./inc/functions.php:249:                       // @TODO Fine all templates which are using these direct variables and rewrite them.
+./inc/functions.php:250:                       // @TODO After this step is done, this else-block is history
+./inc/functions.php:2568:                      $GLOBALS['cache_instance']->destroyCacheFile(); // @TODO isn't it better to do $GLOBALS['cache_instance']->destroyCacheFile('revision')?
+./inc/functions.php:2570:                      // @TODO shouldn't do the unset and the reloading $GLOBALS['cache_instance']->destroyCacheFile() Or a new methode like forceCacheReload('revision')?
+./inc/functions.php:2642:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
+./inc/functions.php:2754:              // @TODO Add a little more infos here
+./inc/functions.php:2765:      // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
+./inc/functions.php:2872:// @TODO Implement $compress
+./inc/functions.php:2879:// @TODO Implement $decompress
+./inc/functions.php:2982:      // @TODO We may want to switch over to UTF-8 here!
+./inc/functions.php:2990:// @TODO Rewrite this function to use READ_FILE() and WRITE_FILE()
+./inc/functions.php:465:// @TODO Rewrite this to an extension 'smtp'
+./inc/language/de.php:1156:// @TODO Rewrite these two constants
+./inc/language/de.php:1172:// @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: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?


@@ -39,8 +39,8 @@
 ./inc/libs/rallye_functions.php:661:                   // @TODO Rewrite this to a function
 ./inc/libs/rallye_functions.php:698:           // @TODO Rewrite this to our API function
 ./inc/libs/register_functions.php:53:          // @TODO Rewrite these constants
 ./inc/libs/rallye_functions.php:661:                   // @TODO Rewrite this to a function
 ./inc/libs/rallye_functions.php:698:           // @TODO Rewrite this to our API function
 ./inc/libs/register_functions.php:53:          // @TODO Rewrite these constants

-./inc/libs/surfbar_functions.php:1427:         // @TODO This can be somehow rewritten
-./inc/libs/surfbar_functions.php:917:  // @TODO Invalid salt should be refused
+./inc/libs/surfbar_functions.php:1425:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:915:  // @TODO Invalid salt should be refused

 ./inc/libs/task_functions.php:261:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/user_functions.php:317:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
 ./inc/libs/task_functions.php:261:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/user_functions.php:317:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);


@@ -53,11 +53,11 @@
 ./inc/modules/admin/admin-inc.php:394:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:508:         // @TODO Rewrite these both constants
 ./inc/modules/admin/admin-inc.php:534:         // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
 ./inc/modules/admin/admin-inc.php:394:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:508:         // @TODO Rewrite these both constants
 ./inc/modules/admin/admin-inc.php:534:         // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query

-./inc/modules/admin/overview-inc.php:229:                              // @TODO Rewrite this to something with include files
-./inc/modules/admin/overview-inc.php:268:                                      // @TODO This may also be rewritten to include files
-./inc/modules/admin/overview-inc.php:271:                                      default: // @TODO Unknown support mode
-./inc/modules/admin/overview-inc.php:389:              // @TODO Rewrite this to one template and use $OUT = ...
-./inc/modules/admin/overview-inc.php:418:                      // @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template
+./inc/modules/admin/overview-inc.php:226:                              // @TODO Rewrite this to something with include files
+./inc/modules/admin/overview-inc.php:265:                                      // @TODO This may also be rewritten to include files
+./inc/modules/admin/overview-inc.php:268:                                      default: // @TODO Unknown support mode
+./inc/modules/admin/overview-inc.php:386:              // @TODO Rewrite this to one template and use $OUT = ...
+./inc/modules/admin/overview-inc.php:415:                      // @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:94:                            // @TODO Why is this set to 'done'?
 ./inc/modules/admin/what-add_points.php:120:                   // @TODO Rewrite these both constants
 ./inc/modules/admin.php:257:   // @TODO Rewrite all these constants
 ./inc/modules/admin.php:94:                            // @TODO Why is this set to 'done'?
 ./inc/modules/admin/what-add_points.php:120:                   // @TODO Rewrite these both constants


@@ -180,22 +180,19 @@
 ./inc/modules/member/what-transfer.php:364:    // @TODO Rewrite these constants
 ./inc/modules/member/what-transfer.php:451:    // @TODO Rewrite all these constants
 ./inc/modules/member/what-unconfirmed.php:134: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/member/what-transfer.php:364:    // @TODO Rewrite these constants
 ./inc/modules/member/what-transfer.php:451:    // @TODO Rewrite all these constants
 ./inc/modules/member/what-unconfirmed.php:134: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()

-./inc/mysql-manager.php:1523:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1738:                          // @TODO Find a way for updating $_CONFIG here
+./inc/mysql-manager.php:1528:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()

 ./inc/mysql-manager.php:173:                   // @TODO Nothing helped???
 ./inc/mysql-manager.php:173:                   // @TODO Nothing helped???

-./inc/mysql-manager.php:1762:          // @TODO Find a way for updating $_CONFIG here
-./inc/mysql-manager.php:1846:                  // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:2140:          // @TODO This can be somehow rewritten
+./inc/mysql-manager.php:1743:                          // @TODO Find a way for updating $_CONFIG here
+./inc/mysql-manager.php:1767:          // @TODO Find a way for updating $_CONFIG here
+./inc/mysql-manager.php:1851:                  // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:2145:          // @TODO This can be somehow rewritten

 ./inc/mysql-manager.php:617:   // @TODO Why is this global??? #100
 ./inc/mysql-manager.php:617:   // @TODO Why is this global??? #100

-./inc/mysql-manager.php:945:                   // @TODO Why does this lead into an endless loop but we still need it???
-./inc/mysql-manager.php:946:                   // @TODO Commented out LOAD_URL("admin.php");
+./inc/mysql-manager.php:946:                   // @TODO Why does this lead into an endless loop but we still need it???
+./inc/mysql-manager.php:947:                   // @TODO Commented out LOAD_URL("admin.php");

 ./mailid_top.php:211:                                                                  // @TODO Rewrite these blocks to filter
 ./surfbar.php:65:              // @TODO Display quick login form here or redirect as configured
 ### ### DEPRECATION FOLLOWS: ### ###
 ./mailid_top.php:211:                                                                  // @TODO Rewrite these blocks to filter
 ./surfbar.php:65:              // @TODO Display quick login form here or redirect as configured
 ### ### DEPRECATION FOLLOWS: ### ###

-./inc/extensions/ext-sql_patches.php:587:              // @DEPRECATED ADD_EXT_SQL("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET gender=sex WHERE sex != 'M'");
-./inc/extensions/ext-sql_patches.php:588:              // @DEPRECATED ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP sex");
-./inc/functions.php:231:       // @DEPRECATED Try to rewrite the if() condition
-./inc/functions.php:2325:              // @DEPRECATED Language array element found in BIG_LETTERS
-./inc/functions.php:2328:              // @DEPRECATED Deprecated constant found
-./inc/functions.php:245:                       // @DEPRECATED
-./inc/modules/admin/what-user_online.php:2:// @DEPRECATED
+./inc/functions.php:2331:              // @DEPRECATED Language array element found in BIG_LETTERS
+./inc/functions.php:2334:              // @DEPRECATED Deprecated constant found
+./inc/functions.php:234:       // @DEPRECATED Try to rewrite the if() condition
+./inc/functions.php:248:                       // @DEPRECATED

diff --git a/DOCS/final-checker.sh b/DOCS/final-checker.sh
index 3d02a6ceb6d75b80ff8ba7e0448995bc509b74f1..665cb34a6000ef4a386a5e2271ccf0310bfa585e 100644 (file)
--- a/DOCS/final-checker.sh
+++ b/DOCS/final-checker.sh
@@ -15,10 +15,13 @@ echo " - DEPRECATED PHP..."
 DEPRECATED_PHP=`find -type f -name "*.php" -exec grep "@DEPRECATED" {} \; | grep "@" --count`
 echo " - DEPRECATED TPL..."
 DEPRECATED_TPL=`find -type f -name "*.tpl" -exec grep "@DEPRECATED" {} \; | grep "@" --count`
 DEPRECATED_PHP=`find -type f -name "*.php" -exec grep "@DEPRECATED" {} \; | grep "@" --count`
 echo " - DEPRECATED TPL..."
 DEPRECATED_TPL=`find -type f -name "*.tpl" -exec grep "@DEPRECATED" {} \; | grep "@" --count`

+echo " - global statements..."
+GLOBALS=`find -type f -name "*.php" -exec grep -Hn "global " {} \;|grep -v "//"| grep -v "phpmailer"|grep -v "/language/"|grep -v "EXT_" --count`

 echo "$0: Result..."
 echo "--------------------------------------"
 echo " - Open TODOs: ${TODOS}"
 echo " - Open DEPRECATED (PHP/TPL): ${DEPRECATED_PHP}/${DEPRECATED_TPL}"
 echo "$0: Result..."
 echo "--------------------------------------"
 echo " - Open TODOs: ${TODOS}"
 echo " - Open DEPRECATED (PHP/TPL): ${DEPRECATED_PHP}/${DEPRECATED_TPL}"

+echo " - Global statements: ${GLOBA:S}"

 echo "--------------------------------------"
 echo "$0: Thanks for waiting for the final release 0.2.1-FINAL! :-)"
 echo
 echo "--------------------------------------"
 echo "$0: Thanks for waiting for the final release 0.2.1-FINAL! :-)"
 echo