Patches from Profi-Concept's branch integrated (except 1599, because it is to large...

diff --git a/inc/extensions/ext-menu.php b/inc/extensions/ext-menu.php
index a3180e75f1843e89f5fa840932ef2e60694604ed..49dd42f87ceefb7ff55ca99d9f1aad64fea4f77d 100644 (file)
--- a/inc/extensions/ext-menu.php
+++ b/inc/extensions/ext-menu.php
@@ -42,17 +42,18 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.0.2');
+setThisExtensionVersion('0.0.3');

 
 // Version history array (add more with , '0.1.0' and so on)
 
 // Version history array (add more with , '0.1.0' and so on)

-setExtensionVersionHistory(array('0.0','0.0.1','0.0.2'));
+setExtensionVersionHistory(array('0.0','0.0.1','0.0.2','0.0.3'));

 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run

+               // @TODO Convert menu-Id to one coding-standard. admin(edit|_add) => admin_menu_(edit|add), mem(edit|_add) => mem_menu_(edit|add)

                addAdminMenuSql('menu',NULL,'Menü-System','Alle drei Menü-System bearbeiten (Admin-, Mitglied- und Gast-Menü)',1);
                addAdminMenuSql('menu','admin_add','Admin-Menü hinzufügen','Weiteren Menüpunkt zum Admin-Bereich hinzufügen',1);
                addAdminMenuSql('menu',NULL,'Menü-System','Alle drei Menü-System bearbeiten (Admin-, Mitglied- und Gast-Menü)',1);
                addAdminMenuSql('menu','admin_add','Admin-Menü hinzufügen','Weiteren Menüpunkt zum Admin-Bereich hinzufügen',1);

-               addAdminMenuSql('menu','adminedit','Vom Admin editieren','Das Administrationsmen&uuml; mit neuen Men&uuml;s erweitern, bestehende &auml;ndern oder l&ouml;schen. <strong>Vorsicht!</strong> L&ouml;schen Sie nicht das Login-Men&uuml;!',2);
+               addAdminMenuSql('menu','adminedit','Admin-Men&uuml; editieren','Das Administrationsmen&uuml; mit neuen Men&uuml;s erweitern, bestehende &auml;ndern oder l&ouml;schen. <strong>Vorsicht!</strong> L&ouml;schen Sie nicht das Login-Men&uuml;!',2);

                addAdminMenuSql('menu','mem_add','Mitgliedsmen&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Mitgliedsmen&uuml; hinzuf&uuml;gen',3);
                addAdminMenuSql('menu','memedit','Mitgliedsmen&uuml; editieren','Mitgliedsmen&uuml; editieren oder l&ouml;schen',4);
                addAdminMenuSql('menu','guest_add','G&auml;ste-Men&uuml; hinzuf&uuml;gen','F&uuml;gen Sie weitere Men&uuml;punkte dem G&auml;ste-Men&uuml; hinzu.',5);
                addAdminMenuSql('menu','mem_add','Mitgliedsmen&uuml; hinzuf&uuml;gen','Weiteren Men&uuml;punkt zum Mitgliedsmen&uuml; hinzuf&uuml;gen',3);
                addAdminMenuSql('menu','memedit','Mitgliedsmen&uuml; editieren','Mitgliedsmen&uuml; editieren oder l&ouml;schen',4);
                addAdminMenuSql('menu','guest_add','G&auml;ste-Men&uuml; hinzuf&uuml;gen','F&uuml;gen Sie weitere Men&uuml;punkte dem G&auml;ste-Men&uuml; hinzu.',5);


@@ -92,6 +93,13 @@ switch (getExtensionMode()) {
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Doppelte Men&uuml;punkte bereinigt.");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Doppelte Men&uuml;punkte bereinigt.");
                                break;

+
+                       case '0.0.3': // SQL queries for v0.0.3
+                               // Change menu-string
+                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title` = 'Admin-Men&uuml; editieren' WHERE `what` = 'adminedit' LIMIT 1");
+
+                               setExtensionUpdateNotes("Men&uuml;punkt &#39;Vom Admin editieren&#39; in &#39;Admin-Men&uuml; editieren&#39; bei bereits bestehenden Installationen um&auml;ndern.");
+                               break;

                } // END - switch
                break;
 
                } // END - switch
                break;
 

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 2bd5e21e7eacec772a29126fd78c46a7f478c6ec..9298c7a42ce8594cdd42f36e8aaab942429c2a0a 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -29,6 +29,8 @@
  * @TODO GolloX: Which charset?                                         *
  * @TODO homeADS: Which charset?                                        *
  * @TODO paid4ad: Waiting for approval                                  *
  * @TODO GolloX: Which charset?                                         *
  * @TODO homeADS: Which charset?                                        *
  * @TODO paid4ad: Waiting for approval                                  *

+ * @TODO secash: Traffic                                                *
+ * @TODO ultraPROMO: Traffic                                            *

  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *


@@ -90,7 +92,6 @@ PRIMARY KEY (`network_id`)
 `network_type_api_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_click_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_banner_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_api_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_click_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_banner_url` VARCHAR(255) NOT NULL DEFAULT '',

-`network_param_default` VARCHAR(255) NULL DEFAULT NULL,

 UNIQUE `provider_type` (`network_id`,`network_type_handle`),
 PRIMARY KEY (`network_type_id`)
 ) TYPE={?_TABLE_TYPE?} COMMENT='Types provideable by networks'");
 UNIQUE `provider_type` (`network_id`,`network_type_handle`),
 PRIMARY KEY (`network_type_id`)
 ) TYPE={?_TABLE_TYPE?} COMMENT='Types provideable by networks'");


@@ -228,107 +229,72 @@ PRIMARY KEY (`network_reload_id`)
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_codes` (`network_code`) VALUES ('REQUEST_PARAMS_INCOMPLETE')");
 
                // Sponsor networks
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_codes` (`network_code`) VALUES ('REQUEST_PARAMS_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 ('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252')");
-
-               // Network type handlers - Yoo!Media (Please use http://www.yoomedia.de?ref=1715 for signing up)
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_id`,`network_type_handle`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES (1, 'banner', 'http://www.yoomedia.de/interface_2.0/out_banner.php', 'http://www.yoomedia.de/code/z-bannerklf.php?id=%ID%&sid=%SID%', 'http://www.yoomedia.de/code/z-banner.php?id=%ID%&sid=%SID%&bid=%BID%'),
-(1, 'surfbar', 'http://www.yoomedia.de/interface_2.0/out_sbanner.php', 'http://www.yoomedia.de/code/s-bannerklf.php?id=%ID%&sid=%SID%', 'http://www.yoomedia.de/code/s-banner.php?id=%ID%&sid=%SID%&bid=%BID%'),
-(1, 'focredbanner', 'http://www.yoomedia.de/interface_2.0/out_fbanner.php', 'http://www.yoomedia.de/code/f-bannerklf.php?id=%ID%&sid=%SID%', 'http://www.yoomedia.de/code/f-banner.php?id=%ID%&sid=%SID%&bid=%BID%'),
-(1, 'textlink', 'http://www.yoomedia.de/interface_2.0/out_textlink.php', 'http://www.yoomedia.de/code/t-textlink.php?id=%ID%&sid=%SID%', ''),
-(1, 'layer', 'http://www.yoomedia.de/interface_2.0/out_layer.php', 'http://www.yoomedia.de/code/l-layer.php?id=%ID%&sid=%SID%', ''),
-(1, 'popup', 'http://www.yoomedia.de/interface_2.0/out_popup.php', 'http://www.yoomedia.de/code/p-popup.php?id=%ID%&sid=%SID%', ''),
-(1, 'popdown', 'http://www.yoomedia.de/interface_2.0/out_popdown.php', 'http://www.yoomedia.de/code/p-popdown.php?id=%ID%&sid=%SID%', ''),
-(1, 'textmail', 'http://www.yoomedia.de/interface_2.0/out_textmail.php', 'http://www.yoomedia.de/code/t-mail.php?id=%ID%&sid=%SID%', ''),
-(1, 'htmlmail', 'http://www.yoomedia.de/interface_2.0/out_htmlmail.php', 'http://www.yoomedia.de/code/h-mail.php?id=%ID%&sid=%SID%', ''),
-(1, 'lead', 'http://www.yoomedia.de/interface_2.0/out_lead.php', 'http://www.yoomedia.de/code/lead.php?id=%ID%&sid=%SID%', ''),
-(1, 'pagepeel', 'http://www.yoomedia.de/interface_2.0/out_pagepeel.php', 'http://www.yoomedia.de/code/p-peel.php?id=%ID%&sid=%SID%', '')");
+               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
+('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252'),
+('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252'),
+('ad-magnet', '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'),
+('ads4', 'Ads4.de', 'http://www.ads4.de/?werber=Quix0r', '|', '|', 'GET', 'WINDOWS-1252'),
+('ads4webbis', 'Ads4Webbis', 'http://www.ads4webbis.de?ref=835', '|', '|', 'GET', 'UTF-8'),
+('ads4world', 'Ads4World', 'http://www.ads4world.de?ref=252', '|', '|', 'GET', 'UTF-8'),
+('affiliblatt', 'Affiliblatt', 'http://www.Affiliblatt.de/?sid=MTAzNQ==&site=home', '|', '|', 'GET', 'UTF-8'),
+('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', 'UTF-8'),
+('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252'),
+('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1')");
+
+               // Network type handlers - Yoo!Media
+
+               // Network type handlers - A3H
+
+               // Network type handlers - Ad-Magnet
+
+               // Network type handlers - AdCocktail
+
+               // Network type handlers - Ads4
+
+               // Network type handlers - Ads4Webbis
+
+               // Network type handlers - Ads4World
+
+               // Network type handlers - Affiliblatt
+
+               // Network type handlers - Alster-Marketing
+
+               // Network type handlers - BonusSponsor
+
+               // Network type handlers - Fusion-Ads
+
+               // Network type handlers - Power-Promo
+
+               // Network type handlers - Make-Euros

 
                // Request parameters per type handler - Yoo!Media
 
                // Request parameters per type handler - Yoo!Media

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 1, 'id', 'id'),
-(1, 1, 'sid', 'sid'),
-(1, 1, 'password', 'pw'),
-(1, 1, 'reload', 'reload'),
-(1, 1, 'remain', 'uebrig'),
-(1, 1, 'reward', 'verguetung'),
-(1, 1, 'size', 'size'),
-(1, 1, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 3, 'id', 'id'),
-(1, 3, 'sid', 'sid'),
-(1, 3, 'password', 'pw'),
-(1, 3, 'reload', 'reload'),
-(1, 3, 'min_stay', 'ma'),
-(1, 3, 'remain', 'uebrig'),
-(1, 3, 'reward', 'verguetung'),
-(1, 3, 'size', 'size'),
-(1, 3, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 9, 'id', 'id'),
-(1, 9, 'sid', 'sid'),
-(1, 9, 'password', 'pw'),
-(1, 9, 'reload', 'reload'),
-(1, 9, 'min_stay', 'ma'),
-(1, 9, 'remain', 'uebrig'),
-(1, 9, 'reward', 'verguetung'),
-(1, 9, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 5, 'id', 'id'),
-(1, 5, 'sid', 'sid'),
-(1, 5, 'password', 'pw'),
-(1, 5, 'reload', 'reload'),
-(1, 5, 'remain', 'uebrig'),
-(1, 5, 'reward', 'verguetung'),
-(1, 5, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 10, 'id', 'id'),
-(1, 10, 'sid', 'sid'),
-(1, 10, 'password', 'pw'),
-(1, 10, 'reload', 'reload'),
-(1, 10, 'remain', 'uebrig'),
-(1, 10, 'reward', 'verguetung'),
-(1, 10, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 11, 'id', 'id'),
-(1, 11, 'sid', 'sid'),
-(1, 11, 'password', 'pw'),
-(1, 11, 'reload', 'reload'),
-(1, 11, 'remain', 'uebrig'),
-(1, 11, 'reward', 'verguetung'),
-(1, 11, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 7, 'id', 'id'),
-(1, 7, 'sid', 'sid'),
-(1, 7, 'password', 'pw'),
-(1, 7, 'reload', 'reload'),
-(1, 7, 'min_stay', 'ma'),
-(1, 7, 'remain', 'uebrig'),
-(1, 7, 'reward', 'verguetung'),
-(1, 7, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 6, 'id', 'id'),
-(1, 6, 'sid', 'sid'),
-(1, 6, 'password', 'pw'),
-(1, 6, 'reload', 'reload'),
-(1, 6, 'min_stay', 'ma'),
-(1, 6, 'remain', 'uebrig'),
-(1, 6, 'reward', 'verguetung'),
-(1, 6, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 2, 'id', 'id'),
-(1, 2, 'sid', 'sid'),
-(1, 2, 'password', 'pw'),
-(1, 2, 'reload', 'reload'),
-(1, 2, 'remain', 'uebrig'),
-(1, 2, 'reward', 'verguetung'),
-(1, 2, 'size', 'size'),
-(1, 2, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 4, 'id', 'id'),
-(1, 4, 'sid', 'sid'),
-(1, 4, 'password', 'pw'),
-(1, 4, 'reload', 'reload'),
-(1, 4, 'remain', 'uebrig'),
-(1, 4, 'reward', 'verguetung'),
-(1, 4, 'erotic', 'erotik')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`request_param_key`,`request_param_value`) VALUES (1, 8, 'id', 'id'),
-(1, 8, 'sid', 'sid'),
-(1, 8, 'password', 'pw'),
-(1, 8, 'reload', 'reload'),
-(1, 8, 'min_stay', 'ma'),
-(1, 8, 'remain', 'uebrig'),
-(1, 8, 'reward', 'verguetung'),
-(1, 8, 'erotic', 'erotik')");
+
+               // Request parameters per type handler - A3H
+
+               // Request parameters per type handler - Ad-Magnet
+
+               // Request parameters per type handler - AdCocktail
+
+               // Request parameters per type handler - Ads4
+
+               // Request parameters per type handler - Ads4Webbis
+
+               // Request parameters per type handler - Ads4World
+
+               // Request parameters per type handler - Affiliblatt
+
+               // Request parameters per type handler - Alster-Marketing
+
+               // Request parameters per type handler - BonusSponsor
+
+               // Request parameters per type handler - Fusion-Ads
+
+               // Request parameters per type handler - Power-Promo
+
+               // Request parameters per type handler - Make-Euros

 
                // Fix empty defaults to NULL
                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_network_request_params` SET `request_param_default`=NULL WHERE `request_param_default`=''");
 
                // Fix empty defaults to NULL
                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_network_request_params` SET `request_param_default`=NULL WHERE `request_param_default`=''");

diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl
index d16ed07024630a9b3d13591882adadb52c31eb4b..4e78c5328f5cb6bef0ec744ff83402e9724d0069 100644 (file)
--- a/templates/de/html/admin/admin_config_menu.tpl
+++ b/templates/de/html/admin/admin_config_menu.tpl
@@ -1,3 +1,4 @@
+<div align="center">

 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_menu%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_menu%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>


@@ -34,3 +35,4 @@
        </tr>
 </table>
 </form>
        </tr>
 </table>
 </form>

+</div>