TODOs and ext-network:

- TODOs.txt updated
- Template parser fixed (notices)
- validation helper script fixed (stderr redirected to stdout)
- TODO added for network AdPaid (which charset?)

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index e2b612f4614abc790856a39e98179f25be306c80..c0b335222005bc420a284a526ef34054ee52da0c 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -5,7 +5,7 @@
 ./birthday_confirm.php:94:             // @TODO Try to rewrite the following unset()
 ./inc/autopurge/purge-inact.php:57:    // @TODO Rewrite these if() blocks to a filter
 ./inc/cache/config-local.php:125:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:468:       // @TODO Add support for more types which break in last else-block
+./inc/classes/cachesystem.class.php:471:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:144:        // @TODO Make this all better... :-/
 ./inc/expression-functions.php:136:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/extensions/ext-html_mail.php:138:                // @TODO Move these arrays into config
@@ -14,35 +14,44 @@
 ./inc/extensions/ext-network.php:21: * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view,     *
 ./inc/extensions/ext-network.php:22: * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
 ./inc/extensions/ext-network.php:23: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
-./inc/extensions/ext-network.php:24: * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
-./inc/extensions/ext-network.php:25: * @TODO doubleads: Which charset?                                      *
-./inc/extensions/ext-network.php:26: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
-./inc/extensions/ext-network.php:27: * @TODO GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:28: * @TODO homeADS: Which charset?                                        *
-./inc/extensions/ext-network.php:29: * @TODO paid4ad: Which URLs for click and banner?                      *
-./inc/extensions/ext-network.php:30: * @TODO Der Werbepartner.cc: Has click/banner URL in API response      *
-./inc/extensions/ext-network.php:84:           // @TODO network_type_handle is an internal name and needs documentation
+./inc/extensions/ext-network.php:24: * @TODO AdPaid: Which charset?                                         *
+./inc/extensions/ext-network.php:25: * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
+./inc/extensions/ext-network.php:26: * @TODO AllAds4You: Traffic from abroad                                *
+./inc/extensions/ext-network.php:27: * @TODO doubleads: Which charset?                                      *
+./inc/extensions/ext-network.php:28: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
+./inc/extensions/ext-network.php:29: * @TODO GolloX: Which charset?                                         *
+./inc/extensions/ext-network.php:30: * @TODO homeADS: Which charset?                                        *
+./inc/extensions/ext-network.php:31: * @TODO paid4ad: Which URLs for click and banner?                      *
+./inc/extensions/ext-network.php:32: * @TODO VIPads: Which charset?                                         *
+./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
+./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
+./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Layer not correct                         *
+./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
+./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
+./inc/extensions/ext-network.php:38: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
+./inc/extensions/ext-network.php:39: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
+./inc/extensions/ext-network.php:93:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:216:               // @TODO Move these into configuration
 ./inc/extensions/ext-rallye.php:331:           // @TODO Move this code into rallye_functions.php
 ./inc/extensions/ext-rallye.php:94:            // @TODO Fix config_rallye_prices to list_rallye_prices
-./inc/extensions/ext-sql_patches.php:763:                      // @TODO Rewrite this to a filter
-./inc/extensions/ext-sql_patches.php:95:               /* @TODO SQL_ALTER_TABLE() should work now properly
+./inc/extensions/ext-sql_patches.php:785:                      // @TODO Rewrite this to a filter
+./inc/extensions/ext-sql_patches.php:96:               /* @TODO SQL_ALTER_TABLE() should work now properly
 ./inc/extensions/ext-yoomedia.php:123:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:56:// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions-functions.php:380:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:493:            // @TODO Extension is loaded, what next?
-./inc/functions.php:1011:// @TODO $simple is deprecated
-./inc/functions.php:1046:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
-./inc/functions.php:2489:              // @TODO Add a little more infos here
+./inc/functions.php:1023:// @TODO $simple is deprecated
+./inc/functions.php:1058:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/functions.php:2534:              // @TODO Add a little more infos here
 ./inc/functions.php:256:       // @TODO Remove this sanity-check if all is fine
-./inc/functions.php:2572:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:2595:                      // @TODO Rewrite this old lost code to a template
 ./inc/functions.php:259:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2684:                      // @TODO Are these convertions still required?
-./inc/functions.php:2702:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3581:// @TODO Lame description for this function
-./inc/functions.php:3603:                      // @TODO Move this in a filter
-./inc/functions.php:3727:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2617:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:2640:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2729:                      // @TODO Are these convertions still required?
+./inc/functions.php:2747:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:3626:// @TODO Lame description for this function
+./inc/functions.php:3648:                      // @TODO Move this in a filter
+./inc/functions.php:3772:      // @TODO This is still very static, rewrite it somehow
 ./inc/functions.php:474:       // @TODO Do only use $content, not $DATA or raw variables
 ./inc/functions.php:544:               // @TODO Extension 'msg' does not exist
 ./inc/functions.php:613:// @TODO Rewrite this to an extension 'smtp'
@@ -62,13 +71,13 @@
 ./inc/libs/bonus_functions.php:216:                    // @TODO Try to find a way for rewriting this constant
 ./inc/libs/bonus_functions.php:304:            // @TODO This query isn't right, it will only update if the user was for a longer time away!
 ./inc/libs/doubler_functions.php:46:// @TODO Lame description
-./inc/libs/rallye_functions.php:719:   $EXPIRE = 3; // @TODO The hard-coded value...
-./inc/libs/rallye_functions.php:783:           // @TODO Rewrite this to our API function
+./inc/libs/rallye_functions.php:722:   $EXPIRE = 3; // @TODO The hard-coded value...
+./inc/libs/rallye_functions.php:786:           // @TODO Rewrite this to our API function
 ./inc/libs/refback_functions.php:61:           // @TODO Try to rewrite the following unset()
-./inc/libs/register_functions.php:287: // @TODO Rewrite these all to a single filter
-./inc/libs/register_functions.php:363: // @TODO Rewrite this to a filter
-./inc/libs/register_functions.php:370: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
-./inc/libs/register_functions.php:371: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
+./inc/libs/register_functions.php:297: // @TODO Rewrite these all to a single filter
+./inc/libs/register_functions.php:373: // @TODO Rewrite this to a filter
+./inc/libs/register_functions.php:380: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
+./inc/libs/register_functions.php:381: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
 ./inc/libs/surfbar_functions.php:1497:         // @TODO This can be somehow rewritten
 ./inc/libs/surfbar_functions.php:950:  // @TODO Invalid salt should be refused
 ./inc/libs/task_functions.php:245:             // @TODO These can be rewritten to filter
@@ -189,7 +198,8 @@
 ./inc/revision-functions.php:153:// @TODO Please describe this function
 ./inc/wrapper-functions.php:127:// @TODO Implement $compress
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress
-./inc/wrapper-functions.php:428:// @TODO Do some more sanity check here
+./inc/wrapper-functions.php:429:// @TODO Do some more sanity check here
+./inc/wrapper-functions.php:747:        * @TODO Do we really need this check? If yes, try to fix this:
 ./mailid.php:135:                                      // @TODO Rewrite this to a filter
 ./mailid.php:215:      // @TODO Rewrite this to a dynamic include or so
 ./mailid.php:95:               // @TODO Rewrite this to a filter
@@ -224,43 +234,39 @@
 ### ### DEPRECATION FOLLOWS: ### ###
 ./inc/modules/admin/admin-inc.php:432:// @DEPRECATED
 ### ### template-warnings.log follows: ### ###
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in 
-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 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_order_points.tpl, line: 14 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
-Warning: DOMDocument::loadHTMLFile(): Document is empty in templates/de/html/header.tpl, line: 1 in /home
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : body in templates/de/html/page_footer.tpl, line: 2 in /home
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : html in templates/de/html/page_footer.tpl, line: 3 in /home
-Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl.
-Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl.
-Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl.
+Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_uberwach.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_jquery.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_book.tpl.
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_overview_footer.tpl, line: 10 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/admin/admin_overview_footer.tpl, line: 11 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_overview_footer.tpl, line: 12 in 
-Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
-Warning: DOMDocument::loadHTMLFile(): Attribute align redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_overview_footer_task.tpl, line: 10 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/admin/admin_overview_footer_task.tpl, line: 11 in 
-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 : table in templates/de/html/admin/admin_logout_sql_patches_remove.tpl, line: 10 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 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_doubler.tpl, line: 52 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_footer.tpl, line: 11 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in 
+Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl.
+Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl.
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 7 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_footer.tpl, line: 11 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_doubler.tpl, line: 52 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_cats_footer.tpl, line: 7 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_cats_footer.tpl, line: 8 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_cats_footer.tpl, line: 9 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute align redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_logout_sql_patches_remove.tpl, line: 10 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_overview_footer_task.tpl, line: 10 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/admin/admin_overview_footer_task.tpl, line: 11 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_overview_footer.tpl, line: 10 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/admin/admin_overview_footer.tpl, line: 11 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_overview_footer.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 12 in 

diff --git a/DOCS/tpl-validator.php b/DOCS/tpl-validator.php
index d4de7418bd1a41df293816810613a83ed0c943f5..a9f18c42ffb3cc35ba5f329894555d7558a4f2a2 100644 (file)
--- a/DOCS/tpl-validator.php
+++ b/DOCS/tpl-validator.php
@@ -77,7 +77,7 @@ if ($data != $newData) {
        print "Template ".$_SERVER['argv'][1]." might be issue-free.\n";
 }
 
-if (strtolower($_SERVER['arv'][2]) == '--write') {
+if ((isset($_SERVER['arv'][2])) && (strtolower($_SERVER['arv'][2]) == '--write')) {
        print "Writing document...\n";
        file_put_contents($_SERVER['argv'][1], $data);
 } // END - if

diff --git a/DOCS/validator.sh b/DOCS/validator.sh
index 931964e3fa8e3b65580ce1f3a49e5f28c5faffad..6b6e8270bf3bf44299027004dfdda1a3f8cd7f06 100755 (executable)
--- a/DOCS/validator.sh
+++ b/DOCS/validator.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
 echo "$0: Validating all templates..."
-find templates/de/html/ -type f -name *.tpl -exec php DOCS/tpl-validator.php {} \; | grep Warning | cut -d "/" -f 1-5 | grep -v "error parsing attribute name" > `dirname $0`/template-warnings.log
+DUMMY=`find templates/de/html/ -type f -name *.tpl -exec php DOCS/tpl-validator.php {} \; 2>&1`
+echo "${DUMMY}" | grep "Warning" | cut -d "/" -f 1-5 | grep -v "error parsing attribute name" > `dirname $0`/template-warnings.log
 echo "$0: done."
+

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 825d3354e9ab7e548f6b5f59783143a740030c22..ed8ba55a44a52d5725a1a350096dbe9979362726 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -21,6 +21,7 @@
  * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view,     *
  * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
  * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
+ * @TODO AdPaid: Which charset?                                         *
  * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
  * @TODO AllAds4You: Traffic from abroad                                *
  * @TODO doubleads: Which charset?                                      *