Charset fixed for SeCash, TODOs.txt updated, deprecated template removed

diff --git a/.gitattributes b/.gitattributes
index 1138ff13d7a706f563464da9ce33898b0ce27600..1d525ea34e129c91a8015f15c0f5dcd99b7a3a0a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1171,7 +1171,6 @@ templates/de/html/admin/admin_menu_hints.tpl -text
 templates/de/html/admin/admin_menu_hints_row.tpl -text
 templates/de/html/admin/admin_menu_overview_row.tpl -text
 templates/de/html/admin/admin_menu_status_row.tpl -text
-templates/de/html/admin/admin_menu_unknown_okay.tpl -text
 templates/de/html/admin/admin_mini_online.tpl -text
 templates/de/html/admin/admin_mmenu_delete.tpl -text
 templates/de/html/admin/admin_mmenu_delete_row.tpl -text

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 54f5b26f5719ec6b2d86330e24911be13c17f020..fc09fc44d77810a9ff4b3ab343d7417efb8bca48 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -15,15 +15,17 @@
 ./inc/extensions/ext-network.php:24: * @TODO Ads4.de: Traffic                                               *
 ./inc/extensions/ext-network.php:25: * @TODO Ads4Webbis: Traffic                                            *
 ./inc/extensions/ext-network.php:26: * @TODO Ads4World: Traffic                                             *
-./inc/extensions/ext-network.php:27: * @TODO Affiliblatt: All except banner                                 *
+./inc/extensions/ext-network.php:27: * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
 ./inc/extensions/ext-network.php:28: * @TODO doubleads: Which charset?                                      *
-./inc/extensions/ext-network.php:29: * @TODO Fusion-Ads: Has click/banner URL in API response               *
-./inc/extensions/ext-network.php:30: * @TODO GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:31: * @TODO homeADS: Which charset?                                        *
-./inc/extensions/ext-network.php:32: * @TODO paid4ad: Waiting for approval                                  *
-./inc/extensions/ext-network.php:33: * @TODO secash: Traffic                                                *
-./inc/extensions/ext-network.php:34: * @TODO ultraPROMO: Traffic                                            *
-./inc/extensions/ext-network.php:87:           // @TODO network_type_handle is an internal name and needs documentation
+./inc/extensions/ext-network.php:29: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
+./inc/extensions/ext-network.php:30: * @TODO GigaPromo: Traffic                                             *
+./inc/extensions/ext-network.php:31: * @TODO GolloX: Which charset?                                         *
+./inc/extensions/ext-network.php:32: * @TODO homeADS: Which charset?                                        *
+./inc/extensions/ext-network.php:33: * @TODO Mega-Ad: Traffic                                               *
+./inc/extensions/ext-network.php:34: * @TODO paid4ad: Waiting for approval                                  *
+./inc/extensions/ext-network.php:35: * @TODO secash: Traffic                                                *
+./inc/extensions/ext-network.php:36: * @TODO ultraPROMO: Traffic                                            *
+./inc/extensions/ext-network.php:89:           // @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
@@ -35,16 +37,16 @@
 ./inc/extensions-functions.php:492:            // @TODO Extension is loaded, what next?
 ./inc/functions.php:1010:// @TODO $simple is deprecated
 ./inc/functions.php:1045:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
-./inc/functions.php:2475:              // @TODO Add a little more infos here
-./inc/functions.php:2557:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:2488:              // @TODO Add a little more infos here
 ./inc/functions.php:255:       // @TODO Remove this sanity-check if all is fine
-./inc/functions.php:2580:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2570:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
 ./inc/functions.php:258:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2669:                      // @TODO Are these convertions still required?
-./inc/functions.php:2687:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3566:// @TODO Lame description for this function
-./inc/functions.php:3588:                      // @TODO Move this in a filter
-./inc/functions.php:3706:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2593:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2682:                      // @TODO Are these convertions still required?
+./inc/functions.php:2700:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:3579:// @TODO Lame description for this function
+./inc/functions.php:3601:                      // @TODO Move this in a filter
+./inc/functions.php:3719:      // @TODO This is still very static, rewrite it somehow
 ./inc/functions.php:473:       // @TODO Do only use $content, not $DATA or raw variables
 ./inc/functions.php:543:               // @TODO Extension 'msg' does not exist
 ./inc/functions.php:612:// @TODO Rewrite this to an extension 'smtp'
@@ -77,18 +79,18 @@
 ./inc/libs/task_functions.php:52:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/user_functions.php:137:     // @TODO These two constants are no longer used, maybe we reactivate this code?
 ./inc/libs/user_functions.php:224:// @TODO Double-check configuration entry here
-./inc/libs/user_functions.php:319:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-./inc/libs/user_functions.php:342:                     // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
-./inc/libs/user_functions.php:417:     // @TODO We should try to rewrite this to fetchUserData() somehow
+./inc/libs/user_functions.php:313:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:333:                     // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:409:     // @TODO We should try to rewrite this to fetchUserData() somehow
 ./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:251:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:256:                         // @TODO ACL is 'allow'... hmmm
-./inc/modules/admin/admin-inc.php:322:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:328:                                                 // @TODO ACL is 'allow'... hmmm
-./inc/modules/admin/admin-inc.php:428:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
-./inc/modules/admin/admin-inc.php:442:         // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
+./inc/modules/admin/admin-inc.php:253:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:258:                         // @TODO ACL is 'allow'... hmmm
+./inc/modules/admin/admin-inc.php:324:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:330:                                                 // @TODO ACL is 'allow'... hmmm
+./inc/modules/admin/admin-inc.php:430:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+./inc/modules/admin/admin-inc.php:444:         // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
 ./inc/modules/admin/overview-inc.php:163:                              // @TODO Rewrite this to a filter
 ./inc/modules/admin/overview-inc.php:277:                              // @TODO Rewrite this to something with include files and/or filter
 ./inc/modules/admin/overview-inc.php:315:                                              // @TODO This may also be rewritten to include files
@@ -178,10 +180,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:1571:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1669:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2113:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2154:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1578:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1676:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2120:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2161:// @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
@@ -191,7 +193,7 @@
 ./inc/revision-functions.php:152:// @TODO Please describe this function
 ./inc/wrapper-functions.php:126:// @TODO Implement $compress
 ./inc/wrapper-functions.php:133:// @TODO Implement $decompress
-./inc/wrapper-functions.php:420:// @TODO Do some more sanity check here
+./inc/wrapper-functions.php:422:// @TODO Do some more sanity check here
 ./mailid.php:134:                                      // @TODO Rewrite this to a filter
 ./mailid.php:214:      // @TODO Rewrite this to a dynamic include or so
 ./mailid.php:94:               // @TODO Rewrite this to a filter
@@ -224,8 +226,7 @@
 ./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5:             <!-- @TODO These are static lines and should be replaced by a filter (see ext-sponsor) //-->
 ./templates/de/html/surfbar/surfbar_frame_top.tpl:23:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top (wouldn't be easy)
 ### ### DEPRECATION FOLLOWS: ### ###
-./inc/modules/admin/admin-inc.php:429:// @DEPRECATED
-./templates/de/html/admin/admin_menu_unknown_okay.tpl:1:<!-- @DEPRECATED //-->
+./inc/modules/admin/admin-inc.php:431:// @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 

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 9d3f894041b6dc5901f0279a580de4ebb86d341f..b3335819a218b0a10dc15261ac7fec89df28503f 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 12/18/2008 *
- * ===================                          Last change: 11/01/2009 *
+ * ===================                          Last change: 12/19/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-network.php                                  *
@@ -24,12 +24,13 @@
  * @TODO Ads4.de: Traffic                                               *
  * @TODO Ads4Webbis: Traffic                                            *
  * @TODO Ads4World: Traffic                                             *
- * @TODO Affiliblatt: All except banner                                 *
+ * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
  * @TODO doubleads: Which charset?                                      *
- * @TODO Fusion-Ads: Has click/banner URL in API response               *
+ * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
  * @TODO GigaPromo: Traffic                                             *
  * @TODO GolloX: Which charset?                                         *
  * @TODO homeADS: Which charset?                                        *
+ * @TODO Mega-Ad: Traffic                                               *
  * @TODO paid4ad: Waiting for approval                                  *
  * @TODO secash: Traffic                                                *
  * @TODO ultraPROMO: Traffic                                            *
@@ -248,7 +249,7 @@ PRIMARY KEY (`network_reload_id`)
 ('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1'),
 ('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252'),
 ('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252'),
-('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'UTF-8'),
+('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252'),
 ('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252')");
 
                // Network type handlers - A3H

diff --git a/templates/de/html/admin/admin_menu_unknown_okay.tpl b/templates/de/html/admin/admin_menu_unknown_okay.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_menu_unknown_okay.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->