Deprecated include inc/language.php removed, TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 7eb12c044ddb8f7a7d0e1755d5606500f7346185..1b24abb51cad951d91dbaafc550f855cd787028f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -182,7 +182,6 @@ inc/install-inc.php -text
 inc/js/.htaccess -text
 inc/js/js-uberwach.php -text
 inc/language-functions.php -text
 inc/js/.htaccess -text
 inc/js/js-uberwach.php -text
 inc/language-functions.php -text

-inc/language.php -text

 inc/language/.htaccess -text
 inc/language/_de.php -text
 inc/language/active_de.php -text
 inc/language/.htaccess -text
 inc/language/_de.php -text
 inc/language/active_de.php -text

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 6ff918de91ca6c929bec62d5919b7ad38af7b0db..9f9b428b64b0399f617005a471acbfc936ee12b3 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -6,12 +6,13 @@
 ./inc/config-functions.php:162:        // @TODO Make this all better... :-/
 ./inc/config-functions.php:187:        // @TODO Rewrite these all to config entries, if somehow possible
 ./inc/config-global.php:60:// @TODO These constants should be rewritten
 ./inc/config-functions.php:162:        // @TODO Make this all better... :-/
 ./inc/config-functions.php:187:        // @TODO Rewrite these all to config entries, if somehow possible
 ./inc/config-global.php:60:// @TODO These constants should be rewritten

-./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:713:                                              // @TODO Rewrite this to a filter!
+./inc/extensions/ext-sql_patches.php:751:                                      // @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:93:               /* @TODO SQL_ALTER_TABLE() should work now properly
 ./inc/extensions/ext-surfbar.php:237:                          // @TODO Set some constants we need???

-./inc/extensions.php:358:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions.php:440:              // @TODO Extension is loaded, what next?
+./inc/extensions.php:345:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions.php:427:              // @TODO Extension is loaded, what next?
+./inc/fix_filters.php:71:      // @TODO Why does this happen? In installation phase of sql_patches?

 ./inc/footer.php:50:   // @TODO Rewrite these all into filters
 ./inc/functions.php:1238:      // @TODO Rewrite this unnice code
 ./inc/functions.php:1299:      // @TODO Remove this if() block if all is working fine
 ./inc/footer.php:50:   // @TODO Rewrite these all into filters
 ./inc/functions.php:1238:      // @TODO Rewrite this unnice code
 ./inc/functions.php:1299:      // @TODO Remove this if() block if all is working fine


@@ -19,7 +20,7 @@
 ./inc/functions.php:214:       // @TODO Remove this sanity-check if all is fine
 ./inc/functions.php:2405:      // @TODO The status should never be empty
 ./inc/functions.php:2496:                      // @TODO shouldn't do the unset and the reloading $GLOBALS['cache_instance']->destroyCacheFile() Or a new methode like forceCacheReload('revision')?
 ./inc/functions.php:214:       // @TODO Remove this sanity-check if all is fine
 ./inc/functions.php:2405:      // @TODO The status should never be empty
 ./inc/functions.php:2496:                      // @TODO shouldn't do the unset and the reloading $GLOBALS['cache_instance']->destroyCacheFile() Or a new methode like forceCacheReload('revision')?

-./inc/functions.php:253:                       // @TODO Fine all templates which are using these direct variables and rewrite them.
+./inc/functions.php:253:                       // @TODO Find all templates which are using these direct variables and rewrite them.

 ./inc/functions.php:254:                       // @TODO After this step is done, this else-block is history
 ./inc/functions.php:2559:// @TODO Please describe this function
 ./inc/functions.php:2577:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
 ./inc/functions.php:254:                       // @TODO After this step is done, this else-block is history
 ./inc/functions.php:2559:// @TODO Please describe this function
 ./inc/functions.php:2577:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);


@@ -42,18 +43,18 @@
 ./inc/language/sponsor_de.php:118:// @TODO Rewrite these four constants to one and use sprintf()
 ./inc/libs/cache_functions.php:412:    // @TODO Add support for more types which break in last else-block
 ./inc/libs/doubler_functions.php:46:// @TODO Lame description
 ./inc/language/sponsor_de.php:118:// @TODO Rewrite these four constants to one and use sprintf()
 ./inc/libs/cache_functions.php:412:    // @TODO Add support for more types which break in last else-block
 ./inc/libs/doubler_functions.php:46:// @TODO Lame description

-./inc/libs/rallye_functions.php:631:   $EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
-./inc/libs/rallye_functions.php:696:           // @TODO Rewrite this to our API function
+./inc/libs/rallye_functions.php:628:   $EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
+./inc/libs/rallye_functions.php:693:           // @TODO Rewrite this to our API function

 ./inc/libs/register_functions.php:53:          // @TODO Rewrite these constants
 ./inc/libs/register_functions.php:62:  // @TODO Rewrite these constants, too
 ./inc/libs/register_functions.php:97:// @TODO This function is no longer used???
 ./inc/libs/register_functions.php:53:          // @TODO Rewrite these constants
 ./inc/libs/register_functions.php:62:  // @TODO Rewrite these constants, too
 ./inc/libs/register_functions.php:97:// @TODO This function is no longer used???

-./inc/libs/surfbar_functions.php:1495:         // @TODO This can be somehow rewritten
-./inc/libs/surfbar_functions.php:954:  // @TODO Invalid salt should be refused
+./inc/libs/surfbar_functions.php:1493:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:949:  // @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/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:311:                             // @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:371:                     // @TODO Can this query be merged with above query?
+./inc/libs/user_functions.php:315:                             // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:340:                             // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:375:                     // @TODO Can this query be merged with above query?

 ./inc/libs/yoomedia_functions.php:65:  $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./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/libs/yoomedia_functions.php:65:  $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./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           *


@@ -145,8 +146,8 @@
 ./inc/modules/admin/what-list_unconfirmed.php:87:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_unconfirmed.php:97:              // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
 ./inc/modules/admin/what-list_user.php:160:            // @TODO Rewrite these to filters
 ./inc/modules/admin/what-list_unconfirmed.php:87:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_unconfirmed.php:97:              // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
 ./inc/modules/admin/what-list_user.php:160:            // @TODO Rewrite these to filters

-./inc/modules/admin/what-list_user.php:285:            // @TODO Rewrite this into a  filter
-./inc/modules/admin/what-list_user.php:337:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:289:            // @TODO Rewrite this into a  filter
+./inc/modules/admin/what-list_user.php:346:                    // @TODO Rewrite this into a filter

 ./inc/modules/admin/what-lock_user.php:139:                            // @TODO Rewrite these all constants
 ./inc/modules/admin/what-logs.php:69:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:72:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-lock_user.php:139:                            // @TODO Rewrite these all constants
 ./inc/modules/admin/what-logs.php:69:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:72:                  // @TODO Fix content-type here


@@ -169,7 +170,7 @@
 ./inc/modules/admin/what-usr_online.php:107:           // @TODO Rewrite this constant
 ./inc/modules/admin/what-usr_online.php:51:    // @TODO Rewrite these constants
 ./inc/modules/admin/what-usr_online.php:52:    // @TODO Add a filter for sponsor
 ./inc/modules/admin/what-usr_online.php:107:           // @TODO Rewrite this constant
 ./inc/modules/admin/what-usr_online.php:51:    // @TODO Rewrite these constants
 ./inc/modules/admin/what-usr_online.php:52:    // @TODO Add a filter for sponsor

-./inc/modules/guest/what-mediadata.php:186:// @TODO Rewrite these all if-blocks to filters
+./inc/modules/guest/what-mediadata.php:180:// @TODO Rewrite these all if-blocks to filters

 ./inc/modules/guest/what-mediadata.php:49:// @TODO Rewrite all constants
 ./inc/modules/guest/what-mediadata.php:69:     // @TODO Find a better formular than this one
 ./inc/modules/guest/what-register.php:208:     // @TODO Rewrite these all to a single filter
 ./inc/modules/guest/what-mediadata.php:49:// @TODO Rewrite all constants
 ./inc/modules/guest/what-mediadata.php:69:     // @TODO Find a better formular than this one
 ./inc/modules/guest/what-register.php:208:     // @TODO Rewrite these all to a single filter


@@ -221,7 +222,7 @@
 ./inc/mysql-manager.php:1845:// @TODO Can this be rewritten to a filter?
 ./inc/mysql-manager.php:1907:                  // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/mysql-manager.php:212:                   // @TODO Nothing helped???
 ./inc/mysql-manager.php:1845:// @TODO Can this be rewritten to a filter?
 ./inc/mysql-manager.php:1907:                  // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/mysql-manager.php:212:                   // @TODO Nothing helped???

-./inc/mysql-manager.php:2205:          // @TODO This can be somehow rewritten
+./inc/mysql-manager.php:2210:          // @TODO This can be somehow rewritten

 ./inc/mysql-manager.php:247:                   // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:538:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:567:                           // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:247:                   // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:538:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:567:                           // @TODO Try to rewrite this to one or more functions

diff --git a/inc/language.php b/inc/language.php
deleted file mode 100644 (file)
index f551ef4..0000000
--- a/inc/language.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-// @DEPRECATED
-?>