From a846d847b39b17912f5255eb448402707a328682 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 7 Mar 2010 01:53:18 +0000 Subject: [PATCH] Misc fixes / improves --- .gitattributes | 1 + DOCS/TODOs.txt | 34 +++++------ inc/extensions/ext-active.php | 2 +- inc/extensions/ext-admintheme1.php | 2 +- inc/extensions/ext-admintheme_default.php | 2 +- inc/extensions/ext-autopurge.php | 2 +- inc/extensions/ext-bank.php | 2 +- inc/extensions/ext-beg.php | 2 +- inc/extensions/ext-birthday.php | 2 +- inc/extensions/ext-debug.php | 2 +- inc/extensions/ext-doubler.php | 2 +- inc/extensions/ext-holiday.php | 2 +- inc/extensions/ext-iso3166.php | 2 +- inc/extensions/ext-logs.php | 2 +- inc/extensions/ext-mailid.php | 2 +- inc/extensions/ext-mods.php | 2 +- inc/extensions/ext-mydata.php | 2 +- inc/extensions/ext-nickname.php | 2 +- inc/extensions/ext-online.php | 2 +- inc/extensions/ext-payout.php | 2 +- inc/extensions/ext-profile.php | 2 +- inc/extensions/ext-rallye.php | 2 +- inc/extensions/ext-refback.php | 3 +- inc/extensions/ext-removeip.php | 2 +- inc/extensions/ext-rewrite.php | 2 +- inc/extensions/ext-sponsor.php | 3 +- inc/extensions/ext-task.php | 2 +- inc/extensions/ext-top10.php | 2 +- inc/extensions/ext-transfer.php | 2 +- inc/extensions/ext-usage.php | 2 +- inc/extensions/ext-yoomedia.php | 4 +- inc/language/network_de.php | 4 +- inc/modules/member/what-sponsor.php | 58 +----------------- inc/modules/member/what-sponsor_list.php | 59 +++++++++++++++++++ .../de/html/admin/admin_list_networks_row.tpl | 4 +- 35 files changed, 113 insertions(+), 109 deletions(-) create mode 100644 inc/modules/member/what-sponsor_list.php diff --git a/.gitattributes b/.gitattributes index f2ec42f3ad..3f95216a65 100644 --- a/.gitattributes +++ b/.gitattributes @@ -564,6 +564,7 @@ inc/modules/member/what-refback.php -text inc/modules/member/what-reflinks.php -text inc/modules/member/what-reflist.php -text inc/modules/member/what-sponsor.php -text +inc/modules/member/what-sponsor_list.php -text inc/modules/member/what-stats.php -text inc/modules/member/what-support.php -text inc/modules/member/what-surfbar_book.php -text diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index c0b3352220..29c88bebbe 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -14,23 +14,22 @@ ./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 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-network.php:24: * @TODO Affiliblatt: All except banner, do they really have UTF-8? * +./inc/extensions/ext-network.php:25: * @TODO AllAds4You: Traffic from abroad * +./inc/extensions/ext-network.php:26: * @TODO doubleads: Which charset? * +./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 * +./inc/extensions/ext-network.php:28: * @TODO GolloX: Which charset? * +./inc/extensions/ext-network.php:29: * @TODO homeADS: Which charset? * +./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner? * +./inc/extensions/ext-network.php:31: * @TODO VIPads: Which charset? * +./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * +./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Forced textlink not correct * +./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Layer not correct * +./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * +./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Surfbar click not correct * +./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Textlink not not correct * +./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * +./inc/extensions/ext-network.php:92: // @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 @@ -233,6 +232,7 @@ ./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:432:// @DEPRECATED +./inc/modules/member/what-sponsor.php:2:// @DEPRECATED ### ### template-warnings.log follows: ### ### Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl. diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 7bba511453..1cab824ee7 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0.9'); diff --git a/inc/extensions/ext-admintheme1.php b/inc/extensions/ext-admintheme1.php index f46cb2b5ec..6a1973445d 100644 --- a/inc/extensions/ext-admintheme1.php +++ b/inc/extensions/ext-admintheme1.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0'); diff --git a/inc/extensions/ext-admintheme_default.php b/inc/extensions/ext-admintheme_default.php index 87e7613947..8247c38a85 100644 --- a/inc/extensions/ext-admintheme_default.php +++ b/inc/extensions/ext-admintheme_default.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0'); diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index bb53a41831..698cebf28e 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.4.0'); diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index b0a53608c4..852120e5da 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0'); diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index abd28703d6..8ec17a7a54 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.2.6'); diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 432b0334a9..09d75959fd 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.3.9'); diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php index 5e30372eca..fda15d3e87 100644 --- a/inc/extensions/ext-debug.php +++ b/inc/extensions/ext-debug.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0'); diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index 088190a19e..9d784494aa 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.1.6'); diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 81aa1376bf..71e8626cbc 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.2.1'); diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php index b5ff4be33e..5a5ddd02b2 100644 --- a/inc/extensions/ext-iso3166.php +++ b/inc/extensions/ext-iso3166.php @@ -41,7 +41,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0.1'); diff --git a/inc/extensions/ext-logs.php b/inc/extensions/ext-logs.php index e7aa7ecce8..48e44ec7da 100644 --- a/inc/extensions/ext-logs.php +++ b/inc/extensions/ext-logs.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0'); diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php index 431f46396f..f2f501e6b0 100644 --- a/inc/extensions/ext-mailid.php +++ b/inc/extensions/ext-mailid.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.3.3'); diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php index 67db83ee32..b50e2c3440 100644 --- a/inc/extensions/ext-mods.php +++ b/inc/extensions/ext-mods.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0.8'); diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php index 3f25f0096b..5dc3ccf8a9 100644 --- a/inc/extensions/ext-mydata.php +++ b/inc/extensions/ext-mydata.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.1.8'); diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index a2fc868878..6475398f35 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.1.9'); diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index c47ec6dfa6..1f6772bf35 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0.5'); diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index 248641174f..604dcac05e 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version of this extension setThisExtensionVersion('0.3.8'); diff --git a/inc/extensions/ext-profile.php b/inc/extensions/ext-profile.php index 8198f78a4f..ad430964ad 100644 --- a/inc/extensions/ext-profile.php +++ b/inc/extensions/ext-profile.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0.9'); diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 572f1d18fb..816f95cc51 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.3.5'); diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index 0099a686b7..4930c2a2ac 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -48,8 +48,7 @@ setThisExtensionVersion('0.0.1'); // Version history array (add more with , '0.1.0' and so on) setExtensionVersionHistory(array('0.0','0.0.1')); -switch (getExtensionMode()) -{ +switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) // SQL commands to run addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_refs`"); diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php index bb9c1400f5..1e44e01e67 100644 --- a/inc/extensions/ext-removeip.php +++ b/inc/extensions/ext-removeip.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0.1'); diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php index c367c1f9d3..42f7f5857e 100644 --- a/inc/extensions/ext-rewrite.php +++ b/inc/extensions/ext-rewrite.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.1.3'); diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 2049f58994..7a6e529256 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -345,7 +345,8 @@ PRIMARY KEY (`id`) // // Member menu // - addMemberMenuSql('main','sponsor','Unsere Sponsoren','N','Y',8); + addMemberMenuSql('main','sponsor_list','Unsere Sponsoren','N','Y',8); + addMemberMenuSql('main','sponsor_reg','Sponsor werden','N','Y',9); // // Add default menus to sponsor menu // diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index 51a22f6590..e79c835499 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.3.2'); diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php index 6633b3104f..35181caa2d 100644 --- a/inc/extensions/ext-top10.php +++ b/inc/extensions/ext-top10.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.1.2'); diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 6ea7326cd2..8cc661e434 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.2.9'); diff --git a/inc/extensions/ext-usage.php b/inc/extensions/ext-usage.php index 9741450a99..f577145233 100644 --- a/inc/extensions/ext-usage.php +++ b/inc/extensions/ext-usage.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0'); diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index f6b350c0fa..f406c3522d 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -41,7 +41,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number setThisExtensionVersion('0.0'); @@ -53,7 +53,7 @@ setExtensionVersionHistory(array('0.0')); setExtensionAlwaysActive('Y'); // This extension is deprecated! -// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y'); +// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) diff --git a/inc/language/network_de.php b/inc/language/network_de.php index c8287d39c8..f6b93063b6 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -80,8 +80,8 @@ addMessages(array( // - Link titles 'ADMIN_NETWORK_LIST_TYPES_LINK_TITLE' => "Weiter zu den Werbearten", 'ADMIN_NETWORK_LIST_PARAMS_LINK_TITLE' => "Weiter zu den API-Parametern", - 'ADMIN_NETWORK_LIST_CODE_TYPES_LINK_TITLE' => "Weiter zu den Rückgabewerten", - 'ADMIN_NETWORK_LIST_CODES_LINK_TITLE' => "Weiter zu den Fehlercodes", + 'ADMIN_NETWORK_LIST_RETURN_CODES_LINK_TITLE' => "Weiter zu den Rückgabewerten", + 'ADMIN_NETWORK_LIST_ERROR_CODES_LINK_TITLE' => "Weiter zu den Fehlercodes", // - Buttons 'ADMIN_NETWORK_ADD' => "Allgemeine Daten anlegen", 'ADMIN_NETWORK_EDIT' => "Editieren", diff --git a/inc/modules/member/what-sponsor.php b/inc/modules/member/what-sponsor.php index 178986817c..f551ef47b7 100644 --- a/inc/modules/member/what-sponsor.php +++ b/inc/modules/member/what-sponsor.php @@ -1,59 +1,3 @@ diff --git a/inc/modules/member/what-sponsor_list.php b/inc/modules/member/what-sponsor_list.php new file mode 100644 index 0000000000..e8f2d2cfc9 --- /dev/null +++ b/inc/modules/member/what-sponsor_list.php @@ -0,0 +1,59 @@ + diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl index 00c6041b4d..013a08f3f0 100644 --- a/templates/de/html/admin/admin_list_networks_row.tpl +++ b/templates/de/html/admin/admin_list_networks_row.tpl @@ -7,8 +7,8 @@ [T|P|CT|C] + href="{%url=modules.php?module=admin&what=list_network_return_codes&network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_RETURN_CODES_LINK_TITLE--}">RC|EC] [$content[network_title]] -- 2.39.5