TODOs.txt updated, notice in README.txt updated which GNU GPL version (2) we are...

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index fff77e8afba2ef118b2a3676e7e1dcac84aed403..cde90a5b31cc3ddec5c720b6c87d4c6e3c739c86 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -6,7 +6,13 @@
 ./inc/classes/cachesystem.class.php:464:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:143:        // @TODO Make this all better... :-/
 ./inc/extensions/ext-html_mail.php:137:                // @TODO Move these arrays into config
-./inc/extensions/ext-network.php:71:           // @TODO network_type_handle is an internal name and needs documentation
+./inc/extensions/ext-network.php:20: * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view,     *
+./inc/extensions/ext-network.php:21: * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
+./inc/extensions/ext-network.php:22: * @TODO ADCocktail: Traffic, BIDausKAS???                              *
+./inc/extensions/ext-network.php:23: * @TODO Ads4.de: Traffic                                               *
+./inc/extensions/ext-network.php:24: * @TODO Ads4Webbis: Traffic                                            *
+./inc/extensions/ext-network.php:25: * @TODO Ads4World: Traffic                                             *
+./inc/extensions/ext-network.php:78:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:215:               // @TODO Move these into configuration
 ./inc/extensions/ext-rallye.php:330:           // @TODO Move this code into rallye_functions.php
 ./inc/extensions/ext-rallye.php:93:            // @TODO Fix config_rallye_prices to list_rallye_prices
@@ -14,31 +20,31 @@
 ./inc/extensions/ext-sql_patches.php:94:               /* @TODO SQL_ALTER_TABLE() should work now properly
 ./inc/extensions/ext-yoomedia.php:122:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:55:// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y');
-./inc/extensions-functions.php:376:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:489:            // @TODO Extension is loaded, what next?
-./inc/filters.php:473:                 // @TODO This whole switch-block is very static
-./inc/filters.php:538:                         case 'config': // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
+./inc/extensions-functions.php:379:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:492:            // @TODO Extension is loaded, what next?
+./inc/filters.php:472:                 // @TODO This whole switch-block is very static
+./inc/filters.php:543:                         case 'config': // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/functions.php:1004:// @TODO $simple is deprecated
 ./inc/functions.php:1039:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
-./inc/functions.php:2439:// @TODO Please describe this function
-./inc/functions.php:2457:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
+./inc/functions.php:2501:// @TODO Please describe this function
+./inc/functions.php:2519:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
 ./inc/functions.php:252:       // @TODO Remove this sanity-check if all is fine
 ./inc/functions.php:255:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2571:              // @TODO Add a little more infos here
-./inc/functions.php:2653:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:2676:                      // @TODO Rewrite this old lost code to a template
-./inc/functions.php:2765:                      // @TODO Are these convertions still required?
-./inc/functions.php:2783:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3662:// @TODO Lame description for this function
-./inc/functions.php:3684:                      // @TODO Move this in a filter
-./inc/functions.php:3802:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2633:              // @TODO Add a little more infos here
+./inc/functions.php:2715:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:2738:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2827:                      // @TODO Are these convertions still required?
+./inc/functions.php:2845:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:3724:// @TODO Lame description for this function
+./inc/functions.php:3746:                      // @TODO Move this in a filter
+./inc/functions.php:3864:      // @TODO This is still very static, rewrite it somehow
 ./inc/functions.php:470:       // @TODO Do only use $content, not $DATA or raw variables
 ./inc/functions.php:540:               // @TODO Extension 'msg' does not exist
 ./inc/functions.php:609:// @TODO Rewrite this to an extension 'smtp'
-./inc/install-functions.php:62:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1155:// @TODO Rewrite these two constants
-./inc/language/de.php:1171:// @TODO Rewrite these five constants
-./inc/language/de.php:850:// @TODO Are these constants longer used?
+./inc/install-functions.php:62:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
+./inc/language/de.php:1157:// @TODO Rewrite these two constants
+./inc/language/de.php:1173:// @TODO Rewrite these five constants
+./inc/language/de.php:851:// @TODO Are these constants longer used?
 ./inc/language-functions.php:233:      // @TODO These are all valid languages, again hard-coded
 ./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
@@ -63,7 +69,7 @@
 ./inc/libs/user_functions.php:319:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
 ./inc/libs/user_functions.php:343:                     // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
 ./inc/libs/user_functions.php:416:     // @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/libs/yoomedia_functions.php:115: $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:352:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
@@ -79,7 +85,7 @@
 ./inc/modules/admin/overview-inc.php:438:                      // @TODO Try to move this in includes
 ./inc/modules/admin/overview-inc.php:44:// @TODO This function does also check for uncompleted tasks
 ./inc/modules/admin/what-add_guestnl_cat.php:48:       // @TODO Check if category does already exist
-./inc/modules/admin/what-add_surfbar_url.php:56:       // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestElement() calls to $postData
+./inc/modules/admin/what-add_surfbar_url.php:56:       // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestParameter() calls to $postData
 ./inc/modules/admin/what-admin_add.php:119:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-admin_add.php:60:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-admin_add.php:76:             // @TODO This can be somehow rewritten to a function
@@ -164,10 +170,10 @@
 ./inc/modules/member/what-unconfirmed.php:142: // @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:1554:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1646:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2105:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2146:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1560:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1658:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2117:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2158:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:228:                   // @TODO Nothing helped???
 ./inc/mysql-manager.php:263:                   // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:556:   // @TODO Try to rewrite this to one or more functions
@@ -198,7 +204,7 @@
 ./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_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.
@@ -213,6 +219,7 @@ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/ht
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_cats_footer.tpl, line: 7 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_cats_footer.tpl, line: 8 in 
+Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_cats_footer.tpl, line: 9 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
@@ -236,7 +243,6 @@ 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 : 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 

diff --git a/DOCS/de/README.txt b/DOCS/de/README.txt
index 018e538d5e8e8feacd6d18c58abb57e9e99f4318..6b79a2c281d22647fcfaa8d85418893388cd1739 100644 (file)
--- a/DOCS/de/README.txt
+++ b/DOCS/de/README.txt
@@ -357,8 +357,8 @@ nicht kontrollieren, wer sich dieses runterlaedt. In jedem Fall mache ich mich
 fuer Folgen und daraus resultierenden Schaeden in keinsterweise verantwortlich
 und entziehe mich von der Haftbarkeit.
 
-Jeder, der diese Software runterlaedt, hat die Lizenz GNU GPL gelesen und
-akzeptiert. Diese wird im jedem vollen Paket (nicht Patches) und Erweiterungen
-mitgeschickt.
+Jeder, der diese Software runterlaedt, hat die Lizenz GNU GPL Version 2 gelesen
+und akzeptiert. Diese wird im jedem vollen Paket (nicht Patches) und
+Erweiterungen mitgeschickt.
 
 [EOF]

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index ae3657213c5179c49e70cc0f075e55e1b9abefd7..1f0ed9e4d91297683d0934d9f8bf08d450e64446 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -22,6 +22,7 @@
  * @TODO ADCocktail: Traffic, BIDausKAS???                              *
  * @TODO Ads4.de: Traffic                                               *
  * @TODO Ads4Webbis: Traffic                                            *
+ * @TODO Ads4World: Traffic                                             *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *