From: Roland Häder Date: Sun, 20 Feb 2011 16:13:59 +0000 (+0000) Subject: Extension ext-network does now show if a network requires the webmaster to send a... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dba0db3d371da5a17ca7da6a8cde2596251660b7;p=mailer.git Extension ext-network does now show if a network requires the webmaster to send a copy of ID card: - Some advertiser networks require you to send them a copy of an ID card or business registration. They are now marked so. - Some more lowercase UTF-8 converted to uppercase - TODOs.txt updated --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 8d3c261673..2be3c4f0dc 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -23,17 +23,18 @@ ./inc/extensions/ext-network.php:25: * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded * ./inc/extensions/ext-network.php:26: * @TODO FuCoExSponsor: Textlink-View is JavaScript! * ./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response * -./inc/extensions/ext-network.php:28: * @TODO GolloX: Which charset? * -./inc/extensions/ext-network.php:29: * @TODO paid4ad: Which URLs for click and banner? * -./inc/extensions/ext-network.php:30: * @TODO VIPads: HTML text is send encoded with BASE64 * -./inc/extensions/ext-network.php:31: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * -./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Forced textlink not correct * -./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Layer not correct * -./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * -./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Surfbar click not correct * -./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Textlink not not correct * -./inc/extensions/ext-network.php:37: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * -./inc/extensions/ext-network.php:91: // @TODO network_type_handle is an internal name and needs documentation +./inc/extensions/ext-network.php:28: * @TODO GeldSponsor.de Requires ID card copy/business reg. * +./inc/extensions/ext-network.php:29: * @TODO GolloX: Which charset? * +./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner? * +./inc/extensions/ext-network.php:31: * @TODO VIPads: HTML text is send encoded with BASE64 * +./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:93: // @TODO network_type_handle is an internal name and needs documentation ./inc/extensions/ext-newsletter.php:218: // @TODO Move these into configuration ./inc/extensions/ext-order.php:336: // @TODO This should be moved out to inc/daily/ ./inc/extensions/ext-rallye.php:329: // @TODO Move this code into rallye_functions.php diff --git a/DOCS/tpl-validator.php b/DOCS/tpl-validator.php index bd8afaa4c1..deead7a895 100644 --- a/DOCS/tpl-validator.php +++ b/DOCS/tpl-validator.php @@ -50,7 +50,7 @@ print "Validating template ".$_SERVER['argv'][1]."...\n"; $doc = new DOMDocument(); $doc->formatOutput = true; $doc->preserveWhiteSpace = false; -$doc->encoding = 'utf-8'; +$doc->encoding = 'UTF-8'; $doc->xmlVersion = '1.1'; $doc->loadHTMLFile($_SERVER['argv'][1]); diff --git a/inc/classes/rdf.class.php b/inc/classes/rdf.class.php index 988b3d2915..78c7e95fbb 100644 --- a/inc/classes/rdf.class.php +++ b/inc/classes/rdf.class.php @@ -799,7 +799,7 @@ class fase4_rdf { case 'textinput': if(isset($this->_display_opt['textinput']) && ($this->_display_opt['textinput'] != 'hidden') && $this->_item['name'] && $this->_item['link']) { $this->_output .= "\n"; - $this->_output .= "
_item['link']."\" "; + $this->_output .= "_item['link']."\" "; if(isset($this->_link_target)) { $this->_output .= "target=\"".$this->_link_target."\" "; } $this->_output .= "method=\"get\">\n"; $this->_output .= "
".$this->_item['title']."
"; diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 3493239ca6..964463054d 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -25,6 +25,7 @@ * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded * * @TODO FuCoExSponsor: Textlink-View is JavaScript! * * @TODO Fusion-Ads: Has click/banner URL in API response * + * @TODO GeldSponsor.de Requires ID card copy/business reg. * * @TODO GolloX: Which charset? * * @TODO paid4ad: Which URLs for click and banner? * * @TODO VIPads: HTML text is send encoded with BASE64 * @@ -83,6 +84,7 @@ switch (getExtensionMode()) { `network_row_seperator` CHAR(4) NOT NULL DEFAULT '|', `network_request_type` ENUM('GET','POST') NOT NULL DEFAULT 'GET', `network_charset` VARCHAR(20) NOT NULL DEFAULT 'UTF-8', +`network_require_id_card` ENUM('Y','N') NOT NULL DEFAULT 'N', UNIQUE (`network_short_name`), PRIMARY KEY (`network_id`) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Network data'"); @@ -268,37 +270,37 @@ PRIMARY KEY (`network_reload_id`) ('REQUEST_PARAMETER_INCOMPLETE')"); // Sponsor networks - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`) VALUES -('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252'), -('abiszed','AbisZED-Netz','http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'WINDOWS-1252'), -('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1'), -('adcocktail', 'ADCocktail', 'http://www.adcocktail.com/?rid=2596', '|', '|', 'GET', 'WINDOWS-1252'), -('adpaid', 'AdPaid', 'http://www.adpaid.de?ref=1464', '|', '|', 'GET', 'ISO-8859-1'), -('ads4', 'Ads4.de', 'http://www.ads4.de/?werber=Quix0r', '|', '|', 'GET', 'WINDOWS-1252'), -('ads4webbis', 'Ads4Webbis', 'http://www.ads4webbis.de?ref=835', '|', '|', 'GET', 'WINDOWS-1252'), -('ads4world', 'Ads4World', 'http://www.ads4world.de?ref=252', '|', '|', 'GET', 'WINDOWS-1252'), -('affiliblatt', 'Affiliblatt', 'http://www.Affiliblatt.de/?sid=MTAzNQ==&site=home', '|', '|', 'GET', 'UTF-8'), -('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1'), -('alster', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16'), -('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252'), -('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'ISO-8859-1'), -('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252'), -('hpsonsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252'), -('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', 'WINDOWS-1252'), -('swizerland', 'The-Swizerland-Ad-Network', 'http://www.the-switzerland-ad-network.ch?ref=3', '|', '|', 'GET', 'WINDOWS-1252'), -('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252'), -('werbepartnercc', 'Der Werbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252'), -('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252'), -('cityads', 'City-Ads', 'http://www.city-ads.de?ref=221', '|', '|', 'GET', 'WINDOWS-1252'), -('goldsponsor', 'Gold-Sponsor', 'http://www.gold-sponsor.de?ref=42', '|', '|', 'GET', 'WINDOWS-1252'), -('doubleads', 'doubleads.de', 'http://www.doubleads.de?ref=1063', '|', '|', 'GET', 'ISO-8859-1'), -('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1'), -('homeads', 'homeADS', 'http://www.homeads.de/?ref=1540', '|', '|', 'GET', 'WINDOWS-1252'), -('fucoexsponsor', 'FuCoExSponsor.net', 'http://fucoexsponsor.net/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1'), -('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`,`network_require_id_card`) VALUES +('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252','N'), +('abiszed','AbisZED-Netz','http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'WINDOWS-1252','Y'), +('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1','N'), +('adcocktail', 'ADCocktail', 'http://www.adcocktail.com/?rid=2596', '|', '|', 'GET', 'WINDOWS-1252','N'), +('adpaid', 'AdPaid', 'http://www.adpaid.de?ref=1464', '|', '|', 'GET', 'ISO-8859-1','N'), +('ads4', 'Ads4.de', 'http://www.ads4.de/?werber=Quix0r', '|', '|', 'GET', 'WINDOWS-1252','N'), +('ads4webbis', 'Ads4Webbis', 'http://www.ads4webbis.de?ref=835', '|', '|', 'GET', 'WINDOWS-1252','N'), +('ads4world', 'Ads4World', 'http://www.ads4world.de?ref=252', '|', '|', 'GET', 'WINDOWS-1252','N'), +('affiliblatt', 'Affiliblatt', 'http://www.Affiliblatt.de/?sid=MTAzNQ==&site=home', '|', '|', 'GET', 'UTF-8','N'), +('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1','N'), +('alster', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16','N'), +('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252','N'), +('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'ISO-8859-1','N'), +('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252','N'), +('hpsonsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252','N'), +('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1','N'), +('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252','N'), +('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252','N'), +('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252','N'), +('swizerland', 'The-Swizerland-Ad-Network', 'http://www.the-switzerland-ad-network.ch?ref=3', '|', '|', 'GET', 'WINDOWS-1252','N'), +('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252','N'), +('werbepartnercc', 'Der Werbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252','N'), +('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252','N'), +('cityads', 'City-Ads', 'http://www.city-ads.de?ref=221', '|', '|', 'GET', 'WINDOWS-1252','N'), +('goldsponsor', 'Gold-Sponsor', 'http://www.gold-sponsor.de?ref=42', '|', '|', 'GET', 'WINDOWS-1252','N'), +('doubleads', 'doubleads.de', 'http://www.doubleads.de?ref=1063', '|', '|', 'GET', 'ISO-8859-1','Y'), +('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1','N'), +('homeads', 'homeADS', 'http://www.homeads.de/?ref=1540', '|', '|', 'GET', 'WINDOWS-1252','N'), +('fucoexsponsor', 'FuCoExSponsor.net', 'http://fucoexsponsor.net/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1','N'), +('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252','N')"); // Network type handlers - A3H addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`,`network_type_handle`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 8632957e68..e2a87575cf 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -122,13 +122,14 @@ addMessages(array( 'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED' => "Es wurden %s API-Parameter gelöscht.", // - Form notes 'ADMIN_NETWORK_ADD_NOTE' => "Mehr Datenschutz bei POST-Abfragen bedeutet, dass die von den Internetanbietern betriebenen Caches (Proxy) die POST-Daten nicht mitloggen (so eine Art Kodex). Der Zeichensatz ist meistens ISO-8859-1 oder WINDOWS-1252.", - 'ADMIN_NETWORK_LIST_NOTE' => "Seien Sie mit dem Löschen und Editieren von Allgemeine Daten sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten.", + 'ADMIN_NETWORK_LIST_NOTE' => "Seien Sie mit dem Löschen und Editieren vonallgemeinen Daten der Werbenetzwerke sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten.", 'ADMIN_NETWORK_TYPES_ADD_NOTE' => "Fügen Sie hier weitere Werbearten dem ausgwählten Werbenetzwerk hinzu. Die Klick- und Banner-URL müssen dabei Platzhalter enthalten, die Sie der Dokumentation und dem Forum entnehmen können. Die API-URL muss nur bis zum Fragezeichen eingegeben werden. Richtig: http://www.some-sponsor.invalid/inteface/script.php, falsch: http://www.some-sponsor.invalid/inteface/script.php?uid=123&pw=xyzxyzxyz", 'ADMIN_NETWORK_TYPES_LIST_NOTE' => "Seien Sie mit dem Löschen und Editieren von Werbeart-Handlern sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Platzhaltern (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", 'ADMIN_NETWORK_REQUEST_PARAMETER_ADD_NOTE' => "Fügen Sie hier weitere API-Parameter dem ausgwählten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei API-Parameter den GET- bzw. POST-Parameternamen an.", 'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE' => "Seien Sie mit dem Löschen und Editieren von API-Parameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Abfragenamen (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", 'ADMIN_NETWORK_API_TRANSLATION_ADD_NOTE' => "Fügen Sie hier weitere Array-Element-Übersetzungen zu dem ausgewählten Netzwerk und Werbeart-Handler ein.", 'ADMIN_NETWORK_API_TRANSLATION_LIST_NOTE' => "Seien Sie mit dem Editieren bzw. Löschen von Array-Elementen sehr vorsichtig, die API-Abfrage köntte unerwartete Ergebnisse bzw. Fehler zurückliefern.", + 'ADMIN_NETWORK_REQUIRES_ID_NOTICE' => "Unter {--ADMIN_NETWORK_REQUIRES_ID--} ist das durch den Webnetzwerkbetreiber Verlangen einerPersonalausweiskopie bzw. Gerwerbescheins zu verstehen. Mehr dazu erfahen Sie im Forum.", // - Other messages 'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgewählten Werbeart-Handlers angezeigt.", 'ADMIN_NETWORK_API_TRANSLATION_LIST_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-Übersetzungen des ausgewählten Werbeart-Handlers angezeigt.", @@ -173,6 +174,7 @@ addMessages(array( 'ADMIN_NETWORK_REQUEST_TYPE_GET' => "GET (meistens richtig)", 'ADMIN_NETWORK_REQUEST_TYPE_POST' => "POST (mehr Datenschutz)", 'ADMIN_NETWORK_CHARSET' => "Zeichensatz", + 'ADMIN_NETWORK_REQUIRES_ID' => "ID verlangt?", 'ADMIN_NETWORK_SEPERATOR' => "Trennzeichen", 'ADMIN_NETWORK_DATA_SEPERATOR2' => "Daten", 'ADMIN_NETWORK_ROW_SEPERATOR2' => "Zeilen", diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php index 3b533b0774..ef72b032d5 100644 --- a/inc/modules/admin/what-list_networks.php +++ b/inc/modules/admin/what-list_networks.php @@ -63,7 +63,15 @@ if ($GLOBALS['network_display'] === false) { // Query for networks $result = SQL_QUERY('SELECT - `network_id`, `network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset` + `network_id`, + `network_short_name`, + `network_title`, + `network_reflink`, + `network_data_seperator`, + `network_row_seperator`, + `network_request_type`, + `network_charset`, + `network_requires_id` FROM `{?_MYSQL_PREFIX?}_network_data` ORDER BY diff --git a/templates/de/html/admin/admin_list_networks.tpl b/templates/de/html/admin/admin_list_networks.tpl index 6608efa4d9..bc82733d4a 100644 --- a/templates/de/html/admin/admin_list_networks.tpl +++ b/templates/de/html/admin/admin_list_networks.tpl @@ -6,7 +6,7 @@ {--ADMIN_NETWORK_SEPERATOR--} -   +   {--ID_SELECT--} @@ -15,11 +15,12 @@ {--ADMIN_NETWORK_DATA_SEPERATOR2--} {--ADMIN_NETWORK_ROW_SEPERATOR2--} {--ADMIN_NETWORK_REQUEST_TYPE--} - {--ADMIN_NETWORK_CHARSET--} + {--ADMIN_NETWORK_CHARSET--} + {--ADMIN_NETWORK_REQUIRES_ID--} $content - + @@ -31,4 +32,8 @@
{--ADMIN_NETWORK_LIST_NOTE--}
+ +
+ {--ADMIN_NETWORK_REQUIRES_ID_NOTICE--} +
diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl index 718887e4d5..3fc9771fb7 100644 --- a/templates/de/html/admin/admin_list_networks_row.tpl +++ b/templates/de/html/admin/admin_list_networks_row.tpl @@ -22,7 +22,10 @@ $content[network_request_type] - + $content[network_charset] + + {%pipe,translateYesNo=$content[network_requires_id]%} +