From 243b763777be72d124e6a6843e24763845d84b0f Mon Sep 17 00:00:00 2001 From: quix0r Date: Fri, 27 Nov 2009 17:29:38 +0000 Subject: [PATCH 01/16] ext-network continued, documentation updated, stelzi's fix integrated: - 10 chars max for default values wasn't correct in ext-network - More networks added (in @TODO tags only currenly) - Language string for adding new network type updated - Missing properties set - TODOs.txt updated --- DOCS/TODOs.txt | 9 ++++++++- DOCS/de/README.txt | 6 +++--- DOCS/de/network/README.txt | 13 +++++++++++++ inc/extensions/ext-grade.php | 6 +++--- inc/extensions/ext-network.php | 10 ++++++++++ inc/language/network_de.php | 5 +++-- inc/modules/admin/what-list_network_params.php | 2 ++ .../de/html/admin/admin_add_network_params.tpl | 2 +- templates/de/html/install/install_page1.tpl | 10 +++++----- 9 files changed, 48 insertions(+), 15 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index cde90a5b31..cfd39e59b0 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -12,7 +12,14 @@ ./inc/extensions/ext-network.php:23: * @TODO Ads4.de: Traffic * ./inc/extensions/ext-network.php:24: * @TODO Ads4Webbis: Traffic * ./inc/extensions/ext-network.php:25: * @TODO Ads4World: Traffic * -./inc/extensions/ext-network.php:78: // @TODO network_type_handle is an internal name and needs documentation +./inc/extensions/ext-network.php:26: * @TODO Affiliblatt: All except banner * +./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 * +./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 make-euros: Which charset? * +./inc/extensions/ext-network.php:32: * @TODO paid4ad: Waiting for approval * +./inc/extensions/ext-network.php:85: // @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 diff --git a/DOCS/de/README.txt b/DOCS/de/README.txt index 6b79a2c281..9dd2a27581 100644 --- a/DOCS/de/README.txt +++ b/DOCS/de/README.txt @@ -357,8 +357,8 @@ nicht kontrollieren, wer sich dieses runterlaedt. In jedem Fall mache ich mich fuer Folgen und daraus resultierenden Schaeden in keinsterweise verantwortlich und entziehe mich von der Haftbarkeit. -Jeder, der diese Software runterlaedt, hat die Lizenz GNU GPL Version 2 gelesen -und akzeptiert. Diese wird im jedem vollen Paket (nicht Patches) und -Erweiterungen mitgeschickt. +Jeder, der diese Software runterlaedt, hat die Lizenz GNU GPL Version 2 oder +jede neuere Version gelesen und akzeptiert. Diese wird im jedem vollen Paket +(nicht Patches) und Erweiterungen mitgeschickt. [EOF] diff --git a/DOCS/de/network/README.txt b/DOCS/de/network/README.txt index 64e39ad85c..05274df105 100644 --- a/DOCS/de/network/README.txt +++ b/DOCS/de/network/README.txt @@ -22,3 +22,16 @@ remain = Mindestanzahl an Klicks nach der gesucht werden soll reward = Mindestverguetung nach der gesucht werden soll size = Groesse des Werbemittels (bei Bannern, Buttons, evtl. Popup/-down) erotic = Ob Erotik-Kampagnen erlaubt oder nicht, oder exklusiv Erotik-Kampagnen holen + +------------------------------------------------------------------------------- + +Referal-Links: +-------------- +Die eingebundenen Referal-Links bleiben bitte erhalten, auch nach der Anmeldung +beim jeweiligen Werbenetzwerk brauchen Sie diese nicht aendern, da keiner +veroeffentlicht wird. Der einizge Grund, weshalb diese vorhanden sind ist der, +dass ich dies als indirekte Bezahlung meiner "Arbeitszeiten" am Script verstehe. + +Deshalb moechte ich Sie auch bitten, meine Referal-Links zum Anmelden zu +verwenden. Wenn Sie selber das Werbenetzwerk bewerben wollen, koennen Sie +selbstverstaendlich Ihren Referal-Link verwenden. diff --git a/inc/extensions/ext-grade.php b/inc/extensions/ext-grade.php index d2c61ca38b..124a9abbdb 100644 --- a/inc/extensions/ext-grade.php +++ b/inc/extensions/ext-grade.php @@ -10,10 +10,10 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Einstufungen Ihrer Mitglieder * * -------------------------------------------------------------------- * - * $Revision:: 856 $ * - * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009) $ * + * $Revision:: $ * + * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * - * $Author:: stelzi $ * + * $Author:: $ * * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 1f0ed9e4d9..2fa817841a 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -23,6 +23,13 @@ * @TODO Ads4.de: Traffic * * @TODO Ads4Webbis: Traffic * * @TODO Ads4World: Traffic * + * @TODO Affiliblatt: All except banner * + * @TODO doubleads: Which charset? * + * @TODO Fusion-Ads: Has click/banner URL in API response * + * @TODO GolloX: Which charset? * + * @TODO homeADS: Which charset? * + * @TODO make-euros: Which charset? * + * @TODO paid4ad: Waiting for approval * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -324,6 +331,9 @@ PRIMARY KEY (`network_reload_id`) (1, 8, 'reward', 'verguetung'), (1, 8, 'erotic', 'erotik')"); + // Fix empty defaults to NULL + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_network_request_params` SET `request_param_default`=NULL WHERE `request_param_default`=''"); + // Admin menu entries addAdminMenuSql('network',NULL,'Werbenetzwerke','Verwalten Sie hier Werbenetzwerke (API-Anbindung), versenden Sie deren Mails, oder übernehmen Sie deren Textlinks und vieles mehr. VORSICHT: Das Einrichten von weiteren Werbenetzwerken ist nicht leicht, dafür aber sehr flexibel! Sollte ein Netzwerk fehlen, so melden Sie dies bitte im Forum!',4); addAdminMenuSql('network','config_networks','API-Daten','Stellen Sie Ihre Affiliate- Webseiten-Id und API-Passwort ein. Diese erhalten Sie zu über 99% aus dem jeweiligen Zugangsbereich des Anbieters. Sollten Sie bei einem Netzwerk noch nicht angemeldet sein, verwenden Sie bitte meinen Referal-Link.',1); diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 5d6e08d77f..7574486b7e 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -104,7 +104,7 @@ addMessages(array( // - 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_TYPES_ADD_NOTE' => "Fügen Sie hier weitere Werbearten dem ausgwählten Werbenetzwerk hinzu. Die Abfrage-, Klick- und Banner-URL müssen dabei Platzhalter enthalten, die Sie der Dokumentation und dem Forum entnehmen können.", + '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.", '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_PARAMS_ADD_NOTE' => "Fügen Sie hier weitere Abfrageparameter dem ausgwählten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei Abfrageparameter den GET- bzw. POST-Parameternamen an.", 'ADMIN_NETWORK_PARAMS_LIST_NOTE' => "Seien Sie mit dem Löschen und Editieren von API-Abfrageparameter 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.", @@ -161,12 +161,13 @@ addMessages(array( 'ADMIN_NETWORK_PARAMS_KEY' => "Abfragename", 'ADMIN_NETWORK_PARAMS_VALUE' => "Abfrageparameter", 'ADMIN_NETWORK_PARAMS_DEFAULT' => "Standartwert", - 'ADMIN_NETWORK_PARAMS_ID' => "Kundennummer (Id)", + 'ADMIN_NETWORK_PARAMS_ID' => "Affiliate-/Merchant-Id", 'ADMIN_NETWORK_PARAMS_SID' => "Webseiten-Id", 'ADMIN_NETWORK_PARAMS_PASSWORD' => "Interface-Kennwort", 'ADMIN_NETWORK_PARAMS_RELOAD' => "Maximale Reloadsperre", 'ADMIN_NETWORK_PARAMS_MINIMUM_STAY' => "Mindestauffenthalt", 'ADMIN_NETWORK_PARAMS_MAXIMUM_STAY' => "Maximaler Auffenthalt", + 'ADMIN_NETWORK_PARAMS_CURRENCY' => "Währung", 'ADMIN_NETWORK_PARAMS_TYPE' => "Typ (z.B. klick/view)", 'ADMIN_NETWORK_PARAMS_REMAIN' => "Mindestanzahl der restlichen Klicks", 'ADMIN_NETWORK_PARAMS_REWARD' => "Mindestvergütung", diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php index 0fd8157b1d..881a69cf7a 100644 --- a/inc/modules/admin/what-list_network_params.php +++ b/inc/modules/admin/what-list_network_params.php @@ -149,6 +149,7 @@ ORDER BY 'reload', 'max_stay', 'min_stay', + 'currency', 'type', 'remain', 'reward', @@ -163,6 +164,7 @@ ORDER BY '{--ADMIN_NETWORK_PARAMS_RELOAD--}', '{--ADMIN_NETWORK_PARAMS_MAXIMUM_STAY--}', '{--ADMIN_NETWORK_PARAMS_MINIMUM_STAY--}', + '{--ADMIN_NETWORK_PARAMS_CURRENCY--}', '{--ADMIN_NETWORK_PARAMS_TYPE--}', '{--ADMIN_NETWORK_PARAMS_REMAIN--}', '{--ADMIN_NETWORK_PARAMS_REWARD--}', diff --git a/templates/de/html/admin/admin_add_network_params.tpl b/templates/de/html/admin/admin_add_network_params.tpl index 6b38c07aef..092e4a287f 100644 --- a/templates/de/html/admin/admin_add_network_params.tpl +++ b/templates/de/html/admin/admin_add_network_params.tpl @@ -34,7 +34,7 @@ {--ADMIN_NETWORK_PARAMS_DEFAULT--}: - + diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index c1ee01de29..d80792fd5e 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -12,23 +12,23 @@ {--SERVER_PATH--}: - + {--BASE_URL--} ({--BASE_URL_NOTE--}): - + {--HP_TITLE--}: - + {--HP_SLOGAN--}: - + {--HP_EMAIL--}: - + -- 2.39.5 From 9bef90747c8e02176ab884cd15f1b143fce05477 Mon Sep 17 00:00:00 2001 From: quix0r Date: Fri, 27 Nov 2009 17:37:36 +0000 Subject: [PATCH 02/16] Integrated stelzi's tweak patches for admin registration form and login --- templates/de/html/admin/admin_login_form.tpl | 4 ++-- templates/de/html/admin/admin_reg_form.tpl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl index bf071ab2e3..2c30f1cbb9 100644 --- a/templates/de/html/admin/admin_login_form.tpl +++ b/templates/de/html/admin/admin_login_form.tpl @@ -14,7 +14,7 @@ {--ENTER_ADMIN_LOGIN--}: - + $content[login_message] @@ -26,7 +26,7 @@ - + $content[pass_message] diff --git a/templates/de/html/admin/admin_reg_form.tpl b/templates/de/html/admin/admin_reg_form.tpl index 51b5b17517..3c9dc9f545 100644 --- a/templates/de/html/admin/admin_reg_form.tpl +++ b/templates/de/html/admin/admin_reg_form.tpl @@ -9,21 +9,21 @@ {--ADMIN_REG_LOGIN--}: - + $content[login_message] {--ADMIN_REG_PASS1--}: - + $content[pass1_message] {--ADMIN_REG_PASS2--}: - + $content[pass2_message] -- 2.39.5 From 6659afffd96060f07013399cf810d7da42845466 Mon Sep 17 00:00:00 2001 From: quix0r Date: Sat, 28 Nov 2009 17:29:25 +0000 Subject: [PATCH 03/16] make-euros has replied me, now when you add request parameters only those from selected type handler will be shown which makes live at easier --- DOCS/TODOs.txt | 5 ++--- inc/extensions/ext-network.php | 1 - inc/language/network_de.php | 2 ++ inc/modules/admin/what-list_network_params.php | 12 +++++++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index cfd39e59b0..b8ef1eb82f 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -17,9 +17,8 @@ ./inc/extensions/ext-network.php:28: * @TODO Fusion-Ads: Has click/banner URL in API response * ./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 make-euros: Which charset? * -./inc/extensions/ext-network.php:32: * @TODO paid4ad: Waiting for approval * -./inc/extensions/ext-network.php:85: // @TODO network_type_handle is an internal name and needs documentation +./inc/extensions/ext-network.php:31: * @TODO paid4ad: Waiting for approval * +./inc/extensions/ext-network.php:84: // @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 diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 2fa817841a..2bd5e21e7e 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -28,7 +28,6 @@ * @TODO Fusion-Ads: Has click/banner URL in API response * * @TODO GolloX: Which charset? * * @TODO homeADS: Which charset? * - * @TODO make-euros: Which charset? * * @TODO paid4ad: Waiting for approval * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 7574486b7e..ff45dd9466 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -108,6 +108,8 @@ addMessages(array( '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_PARAMS_ADD_NOTE' => "Fügen Sie hier weitere Abfrageparameter dem ausgwählten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei Abfrageparameter den GET- bzw. POST-Parameternamen an.", 'ADMIN_NETWORK_PARAMS_LIST_NOTE' => "Seien Sie mit dem Löschen und Editieren von API-Abfrageparameter 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.", + // - Other messages + 'ADMIN_NETWORK_PARAMS_LIST_LIMITED_TO_TYPE' => "Es wurden nur die Abfrageparameter des ausgewählten Werbeart-Handlers angezeigt.", // - Advertise types 'ADMIN_NETWORK_TYPES_BANNER_CLICK' => "Banner-Klick", 'ADMIN_NETWORK_TYPES_BANNER_VIEW' => "Banner-View", diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php index 881a69cf7a..e951930717 100644 --- a/inc/modules/admin/what-list_network_params.php +++ b/inc/modules/admin/what-list_network_params.php @@ -70,6 +70,16 @@ if (isGetRequestParameterSet('network')) { // Init disabled list $networkData['disabled'] = array(); + // Only show params from given type handler if choosen + $ADD = ''; + if (isPostRequestParameterSet('network_type_id')) { + // Only show from current type handler + $ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestParameter('network_type_id'))); + + // Display message + loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_PARAMS_LIST_LIMITED_TO_TYPE')); + } // END - if + // Load all advert types for given network $result = SQL_QUERY_ESC("SELECT p.`network_param_id`, t.`network_type_id`, t.`network_type_handle`, p.`request_param_key`, p.`request_param_value`, p.`request_param_default` @@ -80,7 +90,7 @@ INNER JOIN ON p.`network_type_id`=t.`network_type_id` WHERE - p.`network_id`=%s + p.`network_id`=%s".$ADD." ORDER BY t.`network_type_handle` ASC, p.`network_param_id` ASC", -- 2.39.5 From 277615ed5d293a7f46198483c81c2f1c40fdb40e Mon Sep 17 00:00:00 2001 From: quix0r Date: Sat, 28 Nov 2009 20:20:21 +0000 Subject: [PATCH 04/16] Merchant->Publisher, now better? --- inc/language/network_de.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/language/network_de.php b/inc/language/network_de.php index ff45dd9466..d0e002d8d1 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -163,7 +163,7 @@ addMessages(array( 'ADMIN_NETWORK_PARAMS_KEY' => "Abfragename", 'ADMIN_NETWORK_PARAMS_VALUE' => "Abfrageparameter", 'ADMIN_NETWORK_PARAMS_DEFAULT' => "Standartwert", - 'ADMIN_NETWORK_PARAMS_ID' => "Affiliate-/Merchant-Id", + 'ADMIN_NETWORK_PARAMS_ID' => "Affiliate-/Publisher-Id", 'ADMIN_NETWORK_PARAMS_SID' => "Webseiten-Id", 'ADMIN_NETWORK_PARAMS_PASSWORD' => "Interface-Kennwort", 'ADMIN_NETWORK_PARAMS_RELOAD' => "Maximale Reloadsperre", -- 2.39.5 From 4c69621e5ab1818c99a0abf49984fa1409daf8c3 Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 29 Nov 2009 01:36:09 +0000 Subject: [PATCH 05/16] Patches from Profi-Concept's branch integrated (except 1599, because it is to large but will follow soon) --- inc/extensions/ext-menu.php | 14 +- inc/extensions/ext-network.php | 166 +++++++----------- templates/de/html/admin/admin_config_menu.tpl | 2 + 3 files changed, 79 insertions(+), 103 deletions(-) diff --git a/inc/extensions/ext-menu.php b/inc/extensions/ext-menu.php index a3180e75f1..49dd42f87c 100644 --- a/inc/extensions/ext-menu.php +++ b/inc/extensions/ext-menu.php @@ -42,17 +42,18 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.0.2'); +setThisExtensionVersion('0.0.3'); // 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 + // @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','adminedit','Vom Admin editieren','Das Administrationsmenü mit neuen Menüs erweitern, bestehende ändern oder löschen. Vorsicht! Löschen Sie nicht das Login-Menü!',2); + addAdminMenuSql('menu','adminedit','Admin-Menü editieren','Das Administrationsmenü mit neuen Menüs erweitern, bestehende ändern oder löschen. Vorsicht! Löschen Sie nicht das Login-Menü!',2); addAdminMenuSql('menu','mem_add','Mitgliedsmenü hinzufügen','Weiteren Menüpunkt zum Mitgliedsmenü hinzufügen',3); addAdminMenuSql('menu','memedit','Mitgliedsmenü editieren','Mitgliedsmenü editieren oder löschen',4); addAdminMenuSql('menu','guest_add','Gäste-Menü hinzufügen','Fügen Sie weitere Menüpunkte dem Gäste-Menü hinzu.',5); @@ -92,6 +93,13 @@ switch (getExtensionMode()) { // Update notes (these will be set as task text!) setExtensionUpdateNotes("Doppelte Menü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ü editieren' WHERE `what` = 'adminedit' LIMIT 1"); + + setExtensionUpdateNotes("Menüpunkt 'Vom Admin editieren' in 'Admin-Menü editieren' bei bereits bestehenden Installationen umändern."); + break; } // END - switch break; diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 2bd5e21e7e..9298c7a42c 100644 --- 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 secash: Traffic * + * @TODO ultraPROMO: Traffic * * -------------------------------------------------------------------- * * 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_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'"); @@ -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_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 - 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`=''"); diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index d16ed07024..4e78c5328f 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -1,3 +1,4 @@ +
@@ -34,3 +35,4 @@
+
-- 2.39.5 From 96ceed2053a31f8ab52be4909da2147f8e966215 Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 29 Nov 2009 02:19:19 +0000 Subject: [PATCH 06/16] Profi-Concepts patch integrated and overworked for HTML cleanups --- .../de/html/admin/admin_add_bank_package.tpl | 69 +------ templates/de/html/admin/admin_add_points.tpl | 30 +-- .../de/html/admin/admin_add_points_all.tpl | 13 +- .../de/html/admin/admin_add_reflevel.tpl | 2 + templates/de/html/admin/admin_admin_add.tpl | 59 +----- templates/de/html/admin/admin_admins_add.tpl | 60 +++--- .../de/html/admin/admin_admins_add_acl.tpl | 32 +-- .../de/html/admin/admin_admins_mails_list.tpl | 2 + .../de/html/admin/admin_config_bonus.tpl | 184 +++--------------- .../de/html/admin/admin_config_doubler.tpl | 2 + .../de/html/admin/admin_config_home_main.tpl | 28 ++- .../de/html/admin/admin_config_register2.tpl | 4 +- .../de/html/admin/admin_config_sub_points.tpl | 6 +- templates/de/html/admin/admin_del_user.tpl | 56 ++---- templates/de/html/admin/admin_edit_user.tpl | 18 +- templates/de/html/admin/admin_guest_add.tpl | 63 +----- templates/de/html/admin/admin_list_admins.tpl | 19 +- .../admin/admin_list_doubler_overview.tpl | 6 +- templates/de/html/admin/admin_list_refs.tpl | 2 + templates/de/html/admin/admin_list_user.tpl | 2 + templates/de/html/admin/admin_lock_user.tpl | 14 +- templates/de/html/admin/admin_member_add.tpl | 65 +------ .../html/admin/admin_member_selection_box.tpl | 47 ++--- templates/de/html/admin/admin_sub_points.tpl | 2 + .../de/html/admin/admin_sub_points_all.tpl | 4 +- 25 files changed, 204 insertions(+), 585 deletions(-) diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index d0fc8f7bf9..699883ac47 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -1,60 +1,41 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -161,4 +107,7 @@
+ {--ADMIN_ADD_BANK_PACKAGE_TITLE--}
 
{--ADMIN_BANK_PACKAGE_TITLE--} 
 
{--ADMIN_BANK_PACKAGE_DESCRIPTION--}  
 
{--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}    ({?POINTS?})
 
{--ADMIN_BANK_PACKAGE_FREE_TRANSFERS--} 
 
{--ADMIN_BANK_PACKAGE_OUTPUT_MODE--} 
 
{--ADMIN_BANK_PACKAGE_FREE_MONTHS_FEE--}  {--_MONTHS--}
 
{--ADMIN_BANK_PACKAGE_INTEREST_PLUS--}  %
 
{--ADMIN_BANK_PACKAGE_INTEREST_MINUS--}  %
 
{--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--}   ({?POINTS?})
 
{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}   ({?POINTS?})
 
{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_STUFF--}  
 
{--ADMIN_BANK_PACKAGE_TAN_LOCK--} 
 
+ {--ADMIN_BANK_PACKAGE_ACTIVE--}   + {--YES--}
{--NO--}
 
+
-
{--ADMIN_BANK_FOOTER_NOTE--}
+
+ {--ADMIN_BANK_FOOTER_NOTE--} +
+
diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index 1dca5b5e60..09575415c9 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -1,48 +1,30 @@ +
- - - - - - - - - - - - - - - - - + - - - - - - -
 
+ {--ADMIN_ADD_POINTS_TO_USER--}:
$content[user]
 
 
{--ENTER_POINTS_ADD--}: 
 
{--ENTER_ADD_REASON--}:  + {--ENTER_ADD_REASON--}:
 
 
+
+
diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index f8d9862dbc..89b12fd821 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -1,6 +1,6 @@ +
- +
@@ -35,10 +35,11 @@ - +
 
 
  + + +
+
diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index f05b564ee2..d6abb7ccc3 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -1,3 +1,4 @@ +
@@ -25,3 +26,4 @@
+
diff --git a/templates/de/html/admin/admin_admin_add.tpl b/templates/de/html/admin/admin_admin_add.tpl index e5e282bcee..c83e093988 100644 --- a/templates/de/html/admin/admin_admin_add.tpl +++ b/templates/de/html/admin/admin_admin_add.tpl @@ -1,81 +1,42 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - -
  {--ENTER_TITLE--}:  +  
  {--SELECT_WHAT_NAME--}:  + $content[what_selection]
({--CREATE_WHAT_FIRST--}) 		 
  {--SELECT_PARENT_MENU--}:  + $content[action_selection]
({--CREATE_ACTION_FIRST--}) 		 
  {--ENTER_DESCR--}:  - + +  
{--SELECT_BELOW_MENU--}:$content[below_selection]
 {--SELECT_BELOW_MENU--}: $content[below_selection] 
  +  
+
diff --git a/templates/de/html/admin/admin_admins_add.tpl b/templates/de/html/admin/admin_admins_add.tpl index 8e7ff583a6..09911be03c 100644 --- a/templates/de/html/admin/admin_admins_add.tpl +++ b/templates/de/html/admin/admin_admins_add.tpl @@ -1,53 +1,41 @@ +
- +
- - - - + - - - - - + - - - - - + - - - - - - - - - - + - + + - +
- {--ADMIN_ADMINS_ADD_NEW_ADMIN--}:
  + {--ADMIN_ADMINS_ADD_NEW_ADMIN--}: +
{--ADMIN_ADMINS_ENTER_LOGIN--}: 
  + +
{--ADMIN_ADMINS_ENTER_EMAIL--}: 
  + +
{--ADMIN_ADMINS_ENTER_PASS1--}: 
 
{--ADMIN_ADMINS_ENTER_PASS2--}:  + +
 {--ADMIN_ADMINS_ENTER_PASS2--}: + +
  + + +
-
\ No newline at end of file + +
diff --git a/templates/de/html/admin/admin_admins_add_acl.tpl b/templates/de/html/admin/admin_admins_add_acl.tpl index afd6c7931c..604905dee1 100644 --- a/templates/de/html/admin/admin_admins_add_acl.tpl +++ b/templates/de/html/admin/admin_admins_add_acl.tpl @@ -1,57 +1,41 @@ +
- - - - + - - - - - - - - - - - - - - - + - - - -
- {--ADMIN_ADMINS_ADD_ACL--}:
  + {--ADMIN_ADMINS_ADD_ACL--}: +
{--ADMIN_ADMINS_SELECT_LOGIN--}: 
 
{--ADMIN_ADMINS_SELECT_ACTION--}:  $content[action_selection]
 
{--ADMIN_ADMINS_SELECT_WHAT--}:  $content[what_selection]
 
{--ADMIN_ADMINS_SELECT_MODE--}:  + {--ADMIN_ADMINS_SELECT_MODE--}:
 
+
+
diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl index 5a6cbd128f..0b6a34c482 100644 --- a/templates/de/html/admin/admin_admins_mails_list.tpl +++ b/templates/de/html/admin/admin_admins_mails_list.tpl @@ -1,3 +1,4 @@ +
@@ -25,3 +26,4 @@
+
diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index 2c10397309..df8c7625ce 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -1,140 +1,88 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + -
+ {--ADMIN_ACTIVATE_BONUS_SETTINGS--}
 
{--ADMIN_BONUS_RALLYE_IS_ACTIVE--}   {--YES--}
{--NO--}
 
+ {--ADMIN_BONUS_INCLUDE_OWN--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}   + {--YES--}
{--NO--}
 
 
+ {--ADMIN_BONUS_RALLYE_REF_INCLUDE--}   + {--YES--}
{--NO--}
 
+ {--ADMIN_EDIT_BONUS_SETTINGS--}
 
{--ADMIN_BONUS_ORDER_BONUS--}:   ({?POINTS?})
 
{--ADMIN_BONUS_REF_BONUS--}: @@ -145,56 +93,38 @@ ({?POINTS?})
 
{--ADMIN_BONUS_STATS_BONUS--}:   ({?POINTS?})
 
+ {--ADMIN_BONUS_LOGIN_BONUS--}:   + ({?POINTS?})
 
+ {--ADMIN_BONUS_TURBO_BONUS_TITLE--}:
 
{--ADMIN_BONUS_TURBO_BONUS--}:  ({?POINTS?})
 
+ {--ADMIN_BONUS_TURBO_RATES--}:

@@ -206,149 +136,97 @@
 $content[trates_list]$content[trates_list]
 
+ {--ADMIN_BONUS_TURBO_TIMEOUT_TITLE--}:
 
{--ADMIN_CONFIG_LOGIN_TIMEOUT--}:  $content[login_timeout_selection]
 
{--ADMIN_CONFIG_BONUS_TIMEOUT--}: $content[bonus_timeout_selection]{--ADMIN_CONFIG_BONUS_TIMEOUT--}:$content[bonus_timeout_selection]
 
+ {--ADMIN_BONUS_TURBO_MISC_TITLE--}:
 
{--ADMIN_BONUS_TURBO_RANKS--}: 
 
{--ADMIN_BONUS_TURBO_LINES--}: 
 
{--ADMIN_BONUS_USERID--}:  + {--ADMIN_BONUS_USERID--}: $content[member_selection]
 
+ {--ADMIN_BONUS_RALLYE_NOTIFTICATIONS--}:
 
{--ADMIN_BONUS_RALLYE_EN_NOTIFY--}   {--YES--}
{--NO--}
 
{--ADMIN_BONUS_RALLYE_DI_NOTIFY--}   {--YES--}
{--NO--}
 
{--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}   {--YES--}
{--NO--}
 
{--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--}:   ({?POINTS?})
 
+ {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}:  $content[wait_selection]
 $content[wait_selection]
+
+
diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 660e05111e..49ed962460 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -1,3 +1,4 @@ +
@@ -224,3 +225,4 @@
+
diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl index c6a0396377..dcc2a73ee0 100644 --- a/templates/de/html/admin/admin_config_home_main.tpl +++ b/templates/de/html/admin/admin_config_home_main.tpl @@ -1,19 +1,13 @@
- - - - - - - - - - -
{--ADMIN_CONFIG_HOME_TITLE--} -
-  · {--ADMIN_EDIT_HOME_TARGET--} -
-  · {--ADMIN_EDIT_HOME_SETTINGS--} -
+
+
+ {--ADMIN_CONFIG_HOME_TITLE--} +
+
+  · {--ADMIN_EDIT_HOME_TARGET--} +
+
+  · {--ADMIN_EDIT_HOME_SETTINGS--} +
+
diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index 0bb9a5b783..7ad39b5de7 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -1,5 +1,6 @@ +
- +
{--EDIT_REGFORM_SETTINGS--} @@ -39,3 +40,4 @@
+
diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl index 7cb0532e6b..006636ea77 100644 --- a/templates/de/html/admin/admin_config_sub_points.tpl +++ b/templates/de/html/admin/admin_config_sub_points.tpl @@ -1,7 +1,8 @@ +
- @@ -18,10 +19,11 @@ -
+ {--EDIT_POINTS_SETTINGS--}
+
+
diff --git a/templates/de/html/admin/admin_del_user.tpl b/templates/de/html/admin/admin_del_user.tpl index baee1f189d..906a7cd067 100644 --- a/templates/de/html/admin/admin_del_user.tpl +++ b/templates/de/html/admin/admin_del_user.tpl @@ -1,38 +1,22 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$content[header] -
 
- $content[text] -
 
[ $content[surname] $content[family] ]
 
 
- - -
+
+
+ $content[header] +
+
+ $content[text] +
+ +
+ +
+
+ + +
+
+
diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index 958a66d990..fef7296aae 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -1,13 +1,13 @@ +
- - - - - - - - - - - - -
+ {--ADMIN_EDIT_USER_PROFILE--}: ($content)
{--GENDER--}: 
{--SURNAME--}: 
{--FAMILY--}: 
{--STREET_NR--}: 
{--COUNTRY--}: 
{--ZIP--}: 
{--CITY--}: 
{--EMAIL--}: 
+
{--ADMIN_EDIT_USER_PASSWORD_NOTE--}
{--ADMIN_PASS1--}: 
{--ADMIN_PASS2--}: 
+
+
diff --git a/templates/de/html/admin/admin_guest_add.tpl b/templates/de/html/admin/admin_guest_add.tpl index 51c945be65..e089c58fb2 100644 --- a/templates/de/html/admin/admin_guest_add.tpl +++ b/templates/de/html/admin/admin_guest_add.tpl @@ -1,99 +1,52 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - - -
  {--ENTER_TITLE--}:  +  
  {--SELECT_WHAT_NAME--}:  + $content[what_selection]
({--CREATE_WHAT_FIRST--}) 		 
  {--SELECT_PARENT_MENU--}:  + $content[action_selection]
({--CREATE_ACTION_FIRST--}) 		 
  {--SELECT_BELOW_MENU--}: $content[below_selection] 
$content[below_selection]
  {--MENU_IS_VISIBLE--}:  +  
 {--MENU_IS_ACTIVE--}:  + {--MENU_IS_ACTIVE--}:  
  +  
diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl index 82d12a2c08..bf83baecfb 100644 --- a/templates/de/html/admin/admin_list_admins.tpl +++ b/templates/de/html/admin/admin_list_admins.tpl @@ -1,9 +1,10 @@ +
- +
+ {--ADMIN_ADMINS_EDIT_ACCOUNTS--} + @@ -14,12 +15,12 @@ $content -
- {--ADMIN_ADMINS_EDIT_ACCOUNTS--}
{--ID_SELECT--}
- + + + +
-
\ No newline at end of file + +
diff --git a/templates/de/html/admin/admin_list_doubler_overview.tpl b/templates/de/html/admin/admin_list_doubler_overview.tpl index dbd65882ba..f4699cb7b7 100644 --- a/templates/de/html/admin/admin_list_doubler_overview.tpl +++ b/templates/de/html/admin/admin_list_doubler_overview.tpl @@ -1,3 +1,4 @@ +
@@ -66,13 +67,15 @@ diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 8c5cc7709f..53e17a4ac4 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -2,35 +2,24 @@
@@ -14,7 +15,7 @@
- +
{--ADMIN_DOUBLER_ALREADY_ALL--}: @@ -42,7 +43,7 @@
- +
{--ADMIN_DOUBLER_WAITING_ALL--}: @@ -71,3 +72,4 @@
+ diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index d297927243..ffb3028375 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -1,3 +1,4 @@ +
@@ -19,3 +20,4 @@ $content[rows]
+
diff --git a/templates/de/html/admin/admin_list_user.tpl b/templates/de/html/admin/admin_list_user.tpl index 3cbef37aef..5eb3f45c28 100644 --- a/templates/de/html/admin/admin_list_user.tpl +++ b/templates/de/html/admin/admin_list_user.tpl @@ -1,3 +1,4 @@ +
@@ -10,3 +11,4 @@ $content[rows] {!__PAGE_NAV!}
+
diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index e09c2d22b8..7a51c8ebb2 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -1,3 +1,4 @@ +
@@ -5,31 +6,19 @@
$content[header]
- - - - - - - - - - - -
 
$content[text]
 
[ $content[surname] $content[family] ]
 
 
@@ -38,3 +27,4 @@
+
diff --git a/templates/de/html/admin/admin_member_add.tpl b/templates/de/html/admin/admin_member_add.tpl index 1c8774c8a9..c4ea81c320 100644 --- a/templates/de/html/admin/admin_member_add.tpl +++ b/templates/de/html/admin/admin_member_add.tpl @@ -1,99 +1,54 @@ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - - -
  {--ENTER_TITLE--}:  +  
  {--SELECT_WHAT_NAME--}:  + $content[what_selection]
({--CREATE_WHAT_FIRST--}) 		 
  {--SELECT_PARENT_MENU--}:  + $content[action_selection]
({--CREATE_ACTION_FIRST--}) 		 
  {--SELECT_BELOW_MENU--}: $content[below_selection] 
$content[below_selection]
  {--MENU_IS_VISIBLE--}:  +  
 {--MENU_IS_ACTIVE--}:  + {--MENU_IS_ACTIVE--}:  
  +  
+
diff --git a/templates/de/html/admin/admin_member_selection_box.tpl b/templates/de/html/admin/admin_member_selection_box.tpl index c78cb20767..eb03c87875 100644 --- a/templates/de/html/admin/admin_member_selection_box.tpl +++ b/templates/de/html/admin/admin_member_selection_box.tpl @@ -1,34 +1,21 @@ +
- - - - - - - - - - - - - - - - - - - -
- {--ADMIN_SELECTION_BOX_TITLE--} -
 
- {--ADMIN_SELECT_USER--}: - -
 
 
- - -
+
+
+ {--ADMIN_SELECTION_BOX_TITLE--} +
+
+ {--ADMIN_SELECT_USER--}: + +
+
+ + +
+
+
diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl index aadd77c7dc..060d79a2e6 100644 --- a/templates/de/html/admin/admin_sub_points.tpl +++ b/templates/de/html/admin/admin_sub_points.tpl @@ -1,3 +1,4 @@ +
@@ -26,3 +27,4 @@
+
diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl index fc8279814e..6ed7dbbba9 100644 --- a/templates/de/html/admin/admin_sub_points_all.tpl +++ b/templates/de/html/admin/admin_sub_points_all.tpl @@ -1,5 +1,6 @@ +
- +
@@ -23,3 +24,4 @@
{--ADMIN_SUB_POINTS_FROM_ALL--}:
+
-- 2.39.5 From 84d602a17bc18e9555e3b60717510db14cc2aefa Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 29 Nov 2009 02:44:12 +0000 Subject: [PATCH 07/16] Fixes for bugs when ext-imprint is registered. Resolves #153 --- inc/classes/cachesystem.class.php | 3 +++ inc/wrapper-functions.php | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index 571721e63d..4c23235ac2 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -176,6 +176,9 @@ class CacheSystem { } else { $GLOBALS['cache_array']['themes'][$k][$data['theme_path']] = $v; } + } elseif ($this->name == 'imprint') { + // Imprint + $GLOBALS['cache_array']['imprint'][$k][$data['imprint_id']] = $v; } else { // Finialize the cache and close it $this->finalize(); diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index c9f97c7b21..ca8ef7430b 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -675,7 +675,17 @@ function setUsername ($userName) { // Get username function getUsername () { - return $GLOBALS['username']; + // default is guest + $username = getMessage('USERNAME_GUEST'); + + // User name set? + if (isset($GLOBALS['username'])) { + // Use the set name + $username = $GLOBALS['username']; + } // END - if + + // Return it + return $username; } // Wrapper function for installation phase -- 2.39.5 From 210f4b3bd30ef426d164c3fb6bb4db9394d2fedd Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 29 Nov 2009 10:49:02 +0000 Subject: [PATCH 08/16] More HTML improvements --- inc/extensions/ext-politician-stop.php | 4 +- inc/filters.php | 4 +- inc/footer.php | 5 +- inc/functions.php | 41 ++++- inc/header.php | 26 +-- inc/libs/other_functions.php | 2 +- inc/libs/uberwach_functions.php | 2 +- inc/modules/admin/what-config_bonus.php | 4 +- inc/modules/admin/what-list_country.php | 4 +- inc/mysql-manager.php | 6 +- inc/stylesheet.php | 8 +- .../de/html/admin/admin_add_bank_package.tpl | 9 +- .../de/html/admin/admin_config_holiday.tpl | 32 ++-- .../de/html/admin/admin_config_order.tpl | 22 +-- .../de/html/admin/admin_config_other.tpl | 12 +- .../de/html/admin/admin_config_primera.tpl | 73 +++------ .../de/html/admin/admin_config_surfbar.tpl | 81 ++++------ .../de/html/admin/admin_config_top10.tpl | 27 ++-- .../de/html/admin/admin_config_transfer.tpl | 3 +- .../de/html/admin/admin_config_wernis.tpl | 6 +- .../admin/admin_edit_bank_packages_row.tpl | 9 +- .../de/html/admin/admin_edit_payments_row.tpl | 3 +- .../de/html/admin/admin_send_yoomedia.tpl | 13 +- templates/de/html/guest/guest_login.tpl | 3 +- templates/de/html/guest/guest_register.tpl | 79 +++------ .../html/guest/guest_sponsor_payment_row.tpl | 3 +- templates/de/html/guest/guest_sponsor_reg.tpl | 152 +++--------------- .../html/member/member_html_mail_settings.tpl | 6 +- .../de/html/member/member_nickname_form.tpl | 43 ++--- .../de/html/member/member_order_page2.tpl | 82 +++------- .../html/member/member_payout_form_banner.tpl | 24 +-- 31 files changed, 262 insertions(+), 526 deletions(-) diff --git a/inc/extensions/ext-politician-stop.php b/inc/extensions/ext-politician-stop.php index 275175993d..ec0b11bc3a 100644 --- a/inc/extensions/ext-politician-stop.php +++ b/inc/extensions/ext-politician-stop.php @@ -54,12 +54,12 @@ switch (getExtensionMode()) { addExtensionAdminMenuSql('config','config_politician_stop','Politiker-Stopp-Aktion','Einstellungen zur Satire-Aktion "Politiker-Stopp - Jetzt wird zurück zensiert."', 7); // Register filter - registerFilter('page_footer', 'DISPLAY_POLITICAN_STOP_SNIPPET', false, true, getExtensionDryRun()); + registerFilter('page_footer', 'DISPLAY_POLITICIAN_STOP_SNIPPET', false, true, getExtensionDryRun()); break; case 'remove': // Do stuff when removing extension // Unregister filter - unregisterFilter('page_footer', 'DISPLAY_POLITICAN_STOP_SNIPPET', false, true, getExtensionDryRun()); + unregisterFilter('page_footer', 'DISPLAY_POLITICIAN_STOP_SNIPPET', false, true, getExtensionDryRun()); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/filters.php b/inc/filters.php index c28d8fb3b0..4159a10796 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -928,10 +928,10 @@ function FILTER_DISPLAY_COPYRIGHT () { // Backlink enabled? if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) { // Copyright with backlink, thanks! :-) - loadTemplate('copyright_backlink'); + $GLOBALS['page_footer'] .= loadTemplate('copyright_backlink', true); } else { // No backlink in Copyright note - loadTemplate('copyright'); + $GLOBALS['page_footer'] .= loadTemplate('copyright', true); } } // END - if } diff --git a/inc/footer.php b/inc/footer.php index 72f500281c..058eb4f6ae 100644 --- a/inc/footer.php +++ b/inc/footer.php @@ -41,6 +41,9 @@ if (!defined('__SECURITY')) { die(); } // END - if +// Init page footer +$GLOBALS['page_footer'] = ''; + // Footer disabled or already sent? // 1234 5 54 45 5 5 543 3 321 if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (getOutputMode() != 1))) { @@ -48,7 +51,7 @@ if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($ runFilterChain('page_footer'); // Load page footer - loadTemplate('page_footer'); + $GLOBALS['page_footer'] .= loadTemplate('page_footer', true); } // END - if // Footer has been reached diff --git a/inc/functions.php b/inc/functions.php index 9bf6d0f47d..62aa009248 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -150,6 +150,9 @@ function compileFinalOutput () { // Init counter $cnt = '0'; + // Add page header and footer + addPageHeaderFooter(); + // Compile all out while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) { // Init common variables @@ -2311,7 +2314,7 @@ function displayParsingTime() { ); // Load the template - loadTemplate('show_timings', false, $content); + $GLOBALS['page_footer'] .= loadTemplate('show_timings', true, $content); } // Check wether a boolean constant is set @@ -3928,6 +3931,42 @@ function isSpider () { return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false)); } +// Prepares the header for HTML output +function loadHtmlHeader () { + // Determine the page title + $content['header_title'] = determinePageTitle(); + + // Output page header code + $GLOBALS['page_header'] = loadTemplate('page_header', true, $content); + + // Include meta data in 'guest' module + if (getModule() == 'index') { + // Load meta data template + $GLOBALS['page_header'] .= loadTemplate('metadata', true); + + // Add meta description to header + if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { + // Add meta description not in admin and login module and when the script is installed + generateMetaDescriptionCode(getModule(), getWhat()); + } // END - if + } // END - if + + // Include more header data here + $GLOBALS['page_header'] .= loadTemplate('header', true); + + // Include stylesheet + loadIncludeOnce('inc/stylesheet.php'); + + // Closing HEAD tag + $GLOBALS['page_header'] .= ''; +} + +// Adds page header and footer to output array element +function addPageHeaderFooter () { + // Add them all together. This is maybe to simple + $GLOBALS['output'] = $GLOBALS['page_header'] . $GLOBALS['output'] . $GLOBALS['page_footer']; +} + ////////////////////////////////////////////////// // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // ////////////////////////////////////////////////// diff --git a/inc/header.php b/inc/header.php index 58ba602bd7..d87acc2edd 100644 --- a/inc/header.php +++ b/inc/header.php @@ -47,33 +47,11 @@ if (!defined('__SECURITY')) { if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) { // If not in CSS mode generate the header if (getOutputMode() != 1) { - // Determine the page title - $content['header_title'] = determinePageTitle(); - - // Output page header code - loadTemplate('page_header', false, $content); - - // Include meta data in 'guest' module - if (getModule() == 'index') { - // Load meta data template - loadTemplate('metadata'); - - // Add meta description to header - if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { - // Add meta description not in admin and login module and when the script is installed - generateMetaDescriptionCode(getModule(), getWhat()); - } // END - if - } // END - if - - // Include more header data here - loadTemplate('header'); - - // Include stylesheet - loadIncludeOnce('inc/stylesheet.php'); + // Prepare the header for HTML output + loadHtmlHeader(); } // END - if // Closing HEAD tag - if (getOutputMode() != 1) outputHtml(''); if ($GLOBALS['header_sent'] == '0') $GLOBALS['header_sent'] = 1; } // END - if diff --git a/inc/libs/other_functions.php b/inc/libs/other_functions.php index 5ef70180ff..42f6b03a91 100644 --- a/inc/libs/other_functions.php +++ b/inc/libs/other_functions.php @@ -62,7 +62,7 @@ function displayDebugSqls () { } // END - foreach // Load main template - loadTemplate('admin_other_sqls', false, $OUT); + $GLOBALS['page_footer'] .= loadTemplate('admin_other_sqls', true, $OUT); } // Filter for debugging SQLs diff --git a/inc/libs/uberwach_functions.php b/inc/libs/uberwach_functions.php index 7d6b3420ec..62c765800a 100644 --- a/inc/libs/uberwach_functions.php +++ b/inc/libs/uberwach_functions.php @@ -47,7 +47,7 @@ function loadUberwachSnippet () { $content['REMOTE_ADDR'] = detectRemoteAddr(); // Simply load the template here - loadTemplate('uberwach_snippet', false, $content); + $GLOBALS['page_footer'] .= loadTemplate('uberwach_snippet', true, $content); } // Filter for displaying uberwach snippet diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index 0372884fd5..bd3f764c40 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -97,7 +97,7 @@ if (isFormSent()) { foreach ($RANKS as $k => $rate) { if (!empty($rate)) { // Print only when something is in - $OUT .= "
  •  
    ({?POINTS?})\n"; + $OUT .= "
  • ({?POINTS?})\n"; } // END - if $cnt++; } // END - foreach @@ -108,7 +108,7 @@ if (isFormSent()) { // Add more empty fields for ($i = $cnt; $i < $max; $i++) { - $OUT .= "
  •  
    ({?POINTS?})
    • \n"; + $OUT .= "
  • ({?POINTS?})
    • \n"; } // END - for $OUT .= "\n"; $content['trates_list'] = $OUT; diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 9a0a10ef2c..74d517baae 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -88,7 +88,7 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code'))) $class = 'admin_submit'; $submit = getMessage('ADMIN_COUNTRY_EDIT_NOW'); $title = getMessage('ADMIN_COUNTRY_EDIT_TITLE'); - $reset = ' *'; + $reset = ' '; } else { // Delete template $row = 'admin_list_country_del_row'; @@ -104,7 +104,7 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code'))) foreach (postRequestParameter('id') as $id => $status) { // Load data from DB $result = SQL_QUERY_ESC("SELECT code, descr FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); + array(bigintval($id)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load data list($code, $descr) = SQL_FETCHROW($result); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 96785ed9d3..f6d0955d57 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1675,13 +1675,13 @@ WHERE // Generates meta description for given module and 'what' value function generateMetaDescriptionCode ($module, $what) { - // Exclude admin and member's area - if (($module != 'admin') && ($module != 'login')) { + // Only include from guest area + if ($module == 'index') { // Construct dynamic description $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what); // Output it directly - outputHtml(''); + $GLOBALS['page_header'] .= ''; } // END - if // Remove depth diff --git a/inc/stylesheet.php b/inc/stylesheet.php index 392ea5a4a5..d77e9c9331 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -69,11 +69,11 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) { switch (getConfig('css_php')) { case 'DIRECT': // Just link them (unsupported) - outputHtml(''); + $GLOBALS['page_header'] .= ''; break; case 'FILE': // Output contents - outputHtml(readFromFile($FQFN)); + $GLOBALS['page_header'] .= readFromFile($FQFN); break; default: // Invalid mode! @@ -103,7 +103,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { } // END - foreach // Load template - loadTemplate('css_inline', false, $OUT); + $GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT); } else { // Now we load all CSS files from css.php! $OUT = ''); + $GLOBALS['page_header'] .= $OUT . '%}" />'; } // [EOF] diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index 699883ac47..07bb7183c6 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -25,7 +25,8 @@ {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}     		-  ({?POINTS?}) + + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_FIRST_PAYMENT--} -  ({?POINTS?}) + + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--} -  ({?POINTS?}) + + ({?POINTS?})
    - - - - + - - - - - - - - - - - + - - - - +
    - {--HOLIDAY_ADMIN_CONFIG_HEADER--}
      + {--HOLIDAY_ADMIN_CONFIG_HEADER--} +
    {--HOLIDAY_ADMIN_MAX_HOLIDAY--}: 
    ({--DAYS--})
     
    {--HOLIDAY_ADMIN_LOCKED--}:  $content[locked]
     
    {--HOLIDAY_ADMIN_MODE--}:  + {--HOLIDAY_ADMIN_MODE--}: {--HOLIDAY_ADMIN_MODE_RESET--}
    @@ -38,13 +27,10 @@
     
      + + +
    diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 10a85a00de..5875a02bd9 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -15,10 +15,10 @@ - {--ADMIN_ORDER_MAX--}:  + {--ADMIN_ORDER_MAX--}: - {--ADMIN_ORDER_ORDER--}:  + {--ADMIN_ORDER_ORDER--}: @@ -39,30 +39,24 @@ {--ADMIN_OPTION_CHECK_EMAIL_TEXT--}: - - {--YES--}:   - {--NO--}:  - + {--YES--}: + {--NO--}: {--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}: - - {--YES--}:   - {--NO--}:  - + {--YES--}: + {--NO--}: {--ADMIN_OPTION_URL_BLACKLIST--}: - - {--YES--}:   - {--NO--}:  - + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 58a2b3db46..25c64a8e10 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -163,8 +163,8 @@ {--ADMIN_OPTION_AUTOSEND_ACTIVE--}: - {--YES--}:  - {--NO--}:  + {--YES--}: + {--NO--}: @@ -177,16 +177,16 @@ {--ADMIN_OPTION_SEND_UPDATE--}: - {--YES--}:   - {--NO--}:  + {--YES--}: + {--NO--}: {--ADMIN_OPTION_NOTIFY_ADMIN--}: - {--YES--}:   - {--NO--}:  + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl index b1464cce5a..af4cc5a4cd 100644 --- a/templates/de/html/admin/admin_config_primera.tpl +++ b/templates/de/html/admin/admin_config_primera.tpl @@ -2,77 +2,54 @@
    - - - - + - - - - - + - - - + - - - - - - - - - - - - + - - - - - - - - - - + - + + - +
    - {--PRIMERA_ADMIN_CONFIG_TITLE--}
      + {--PRIMERA_ADMIN_CONFIG_TITLE--} +
    {--PRIMERA_ADMIN_API_NAME--}: 
      + +
    {--PRIMERA_ADMIN_API_MD5--}: {--PRIMERA_ADMIN_API_MD5--}:
     
    + Gespeicherter Hash:
    »{?primera_api_md5]«
    {--PRIMERA_ADMIN_REFID--}: 
     
      + +
    {--PRIMERA_ADMIN_MIN_PAYOUT--}:  Wernis
     
    {--PRIMERA_ADMIN_MIN_WITHDRAW--}:  Wernis + + Wernis +
     {--PRIMERA_ADMIN_MIN_WITHDRAW--}: + + Wernis +
      + + +
    diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 037ebaa43a..3875da01a2 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -1,3 +1,4 @@ +
    @@ -5,25 +6,24 @@ {--ADMIN_CONFIG_SURFBAR_TITLE--} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index a1557dc950..12f3659a56 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -123,7 +123,8 @@ @@ -133,7 +134,8 @@ diff --git a/templates/de/html/admin/admin_edit_bank_packages_row.tpl b/templates/de/html/admin/admin_edit_bank_packages_row.tpl index 4a16d28c23..e99e3d8305 100644 --- a/templates/de/html/admin/admin_edit_bank_packages_row.tpl +++ b/templates/de/html/admin/admin_edit_bank_packages_row.tpl @@ -9,7 +9,8 @@ @@ -19,7 +20,8 @@ diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl index 3c5fb22304..6581122dfb 100644 --- a/templates/de/html/admin/admin_edit_payments_row.tpl +++ b/templates/de/html/admin/admin_edit_payments_row.tpl @@ -28,7 +28,8 @@ diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl index f8e4c97089..57aaa84875 100644 --- a/templates/de/html/admin/admin_send_yoomedia.tpl +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -5,7 +5,6 @@ {--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--} - - - - - - - - - diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index 344e3ef087..9f08f4d693 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -12,14 +12,12 @@ - - - - - - - - - - - - - - - - $content[refid_content] - - - - - - - - - - - - diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 97126affa9..d787d57688 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -1,84 +1,61 @@
    {--GUEST_SPONSOR_TITLE--}
    -
    -
    - $content[form_errors] -
    -
    -
      -
    • Melden Sie sich als Sponsor von {?MAIN_TITLE?} an! Hier bekommen Sie für Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!
      • -
    • Alles inklusiv: Ausführliche Statistiken (auch per Mail im gewünschten Zeitabstand) und einfache Verwaltung Ihrer {?POINTS?} mit nur wenigen Klicks!
      • -
    • Werden Sie Sponsor und melden Sie sich noch heute an!
      • -
    -
    +
    + $content[form_errors] +
    +
    +
      +
    • Melden Sie sich als Sponsor von {?MAIN_TITLE?} an! Hier bekommen Sie für Ihr Geld die Zielgruppe, die Sie auch auf Ihren Produktseiten haben wollen!
      • +
    • Alles inklusiv: Ausführliche Statistiken (auch per Mail im gewünschten Zeitabstand) und einfache Verwaltung Ihrer {?POINTS?} mit nur wenigen Klicks!
      • +
    • Werden Sie Sponsor und melden Sie sich noch heute an!
      • +
    +
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_REWARD--} -  ({?POINTS?}) + + ({?POINTS?})
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_COSTS--} -  ({?POINTS?}) + + ({?POINTS?})
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_TIME--} @@ -32,7 +32,6 @@ $content[surfbar_static_time]
     
    {--ADMIN_CONFIG_SURFBAR_STATIC_LOCK--} @@ -41,7 +40,6 @@ $content[surfbar_static_lock]
     
    {--ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT--} @@ -50,7 +48,6 @@ %
     
    {--ADMIN_CONFIG_SURFBAR_MAX_ORDER--} @@ -59,7 +56,6 @@
     
    {--ADMIN_CONFIG_SURFBAR_RESTART_TIME--} @@ -68,7 +64,6 @@ $content[surfbar_restart_time]
     
    {--ADMIN_CONFIG_SURFBAR_STATS_RELOAD--} @@ -77,7 +72,6 @@ $content[surfbar_stats_reload]
     
    {--ADMIN_CONFIG_SURFBAR_PURGE_DELETED--} @@ -86,22 +80,19 @@ $content[surfbar_purge_deleted]
     
    + {--ADMIN_CONFIG_SURFBAR_PURGE_MIGRATED--} + $content[surfbar_purge_migrated]
     
    {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL--}
     
    {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--} @@ -111,14 +102,13 @@
    + {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC--} +
     
    {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE--} @@ -141,103 +131,87 @@
     
    + {--ADMIN_CONFIG_SURFBAR_PAUSE_URL--} +
     
     
    + {--ADMIN_CONFIG_SURFBAR_AUTOSTART--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_NOTIFICATION_MODE--} +
     
     
    {--ADMIN_CONFIG_SURFBAR_WARN_LOW_POINTS--} -  ({?POINTS?}) + + ({?POINTS?})
     
    + {--ADMIN_CONFIG_SURFBAR_LOW_INTERVAL--} + $content[surfbar_low_interval]
     
     
    + {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--} + {--YES--} {--NO--}
     
     
    + {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM--} + {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_Y--}
    {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM_N--}
     
    @@ -250,3 +224,4 @@
    {--ADMIN_CONFIG_SURFBAR_NOTE--}
    + diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl index 6d3edbeaea..9b5d5e0fdf 100644 --- a/templates/de/html/admin/admin_config_top10.tpl +++ b/templates/de/html/admin/admin_config_top10.tpl @@ -2,26 +2,21 @@ - + - + + - - - - - - - - - +
    - {--TOP10_ADMIN_CONFIG_HEADER--} + {--TOP10_ADMIN_CONFIG_HEADER--} +
     {--TOP10_ADMIN_MAX_TOP10--}: + +
    {--TOP10_ADMIN_MAX_TOP10--}: 
     
      + + +
    diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index 55dc011857..98633a7c22 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -39,7 +39,8 @@     		{--ADMIN_TRANSFER_BALANCE--}:   -  ({?POINTS?}) + + ({?POINTS?})
    {--WERNIS_ADMIN_PAYOUT_FEE_FIX--}:   -  ({?POINTS?}) + + ({?POINTS?})
    {--WERNIS_ADMIN_WITHDRAW_FEE_FIX--}:   -  ({?POINTS?}) + + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_ACCOUNT_FEE--}:
    -  ({?POINTS?}) + + ({?POINTS?})
    {--ADMIN_BANK_PACKAGE_TRANSFER_FEE--}:
    -  ({?POINTS?}) + + ({?POINTS?})     		{--ADMIN_BANK_PACKAGE_OUTPUT_MODE--}:
    @@ -51,7 +53,8 @@     		{--ADMIN_BANK_PACKAGE_FREE_ACCOUNT_INCOME--}:
    -  ({?POINTS?}) + + ({?POINTS?})
    {--PAY_PRICE--}:  -  ({?POINTS?}) + + ({?POINTS?})
     
    {--SELECT_CATEGORY--}: @@ -16,42 +15,37 @@
     
    {--ENTER_RECEIVER--}: {--ADMIN_YOOMEDIA_RECEIVER_ARE_ALL_NOTE--}
     
    {--ENTER_POINTS--}: -  ({?POINTS?}) + + ({?POINTS?})
     
    {--ENTER_SECONDS--}: {--_SECONDS--}
     
    {--ENTER_SUBJECT--}:
     
    {--ENTER_TEXT--}:
     
    {--MEMBER_ENTER_URL--}: @@ -62,11 +56,10 @@
    + {--ADMIN_YOOMEDIA_ENTER_URL_NOTE--}
     
    diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl index 3bcbff7e77..67d3aaff7c 100644 --- a/templates/de/html/guest/guest_login.tpl +++ b/templates/de/html/guest/guest_login.tpl @@ -60,7 +60,8 @@
    {--GUEST_ENTER_LOGIN--}: -   {--_OR--} + + {--_OR--}
     
    + + {--GUEST_GENDER--}$content[must_fillout_gender]: + - - - + {--FAMILY--}$content[must_fillout_family]: + - - - + {--STREET_NR--}$content[must_fillout_street_nr]: + - - - + {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip], + {--CITY--}$content[must_fillout_city]: + - - - + $content[country] + + + - - - - - - - + {--BIRTHDAY--}$content[must_fillout_birthday]: + +
    - {--GUEST_GENDER--}$content[must_fillout_gender]:  
     
    {--SURNAME--}$content[must_fillout_surname], - {--FAMILY--}$content[must_fillout_family]:  
     
    - {--STREET_NR--}$content[must_fillout_street_nr]:  
     
    - {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip], - {--CITY--}$content[must_fillout_city]:   - $content[country]    -
     
    @@ -72,16 +61,13 @@
     
    - {--BIRTHDAY--}$content[must_fillout_birthday]:  $content[birthday_selection]
      + $content[birthday_selection] +
    @@ -91,9 +77,6 @@
     
    {--REGISTER_CATEGORIES--}: @@ -112,9 +95,6 @@ {--REGISTER_MISC--}:
     
    {--PASS_1--}, {--PASS_2--}: @@ -124,40 +104,25 @@
     
    $content[max_receive_list]
     
     
    + {--TERMS_OF_USAGE--}:
    {--YOU_FINALIZE--}
     
    + {--AGREE_TO_THIS--}: + {--YES--}: {--NO--}:
     
    diff --git a/templates/de/html/guest/guest_sponsor_payment_row.tpl b/templates/de/html/guest/guest_sponsor_payment_row.tpl index 75fdedab01..ee0fab337c 100644 --- a/templates/de/html/guest/guest_sponsor_payment_row.tpl +++ b/templates/de/html/guest/guest_sponsor_payment_row.tpl @@ -1,6 +1,7 @@
    -  $content[pay_name]
    + + $content[pay_name]
    ($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      + {--SPONSOR_ENTER_COMPANY_DATA--}  
      +
    {--SPONSOR_COMPANY_NOTE--}
    		 
     
      {--SPONSOR_ENTER_COMPANY_TITLE--}:     
     
      {--SPONSOR_ENTER_COMPANY_POSITION--}:     
     
      {--SPONSOR_ENTER_TAX_IDENT--}:     
     
      + {--SPONSOR_ENTER_PERSONA_DATA--}  
     
      {--GUEST_GENDER--}:     
     
      {--GUEST_SURNAME--}:     
     
      {--GUEST_FAMILY--}:     
     
      + {--SPONSOR_ENTER_CONTACT_DATA--}  
     
      {--SPONSOR_ENTER_STREET_NR1--}:     
     
      {--SPONSOR_ENTER_STREET_NR2--}:     
     
      {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:    -  
     
      {--SPONSOR_ENTER_PHONE--}:     
     
      {--SPONSOR_ENTER_FAX--}:     
     
      {--SPONSOR_ENTER_CELL--}:     
     
      {--SPONSOR_ENTER_EMAIL--}:     
     
      {--SPONSOR_ENTER_URL--}:     
     
      + {--SPONSOR_ENTER_PASSWORDS--}  
     
      {--SPONSOR_ENTER_PASSWORDS--}:     
     
      + {--SPONSOR_REFERAL--}  
     
      {--SPONSOR_REFID_WAS--}:    $content[refid]  
     
      + {--SPONSOR_WARNINGS--}  
     
      {--GUEST_SPONSOR_RECEIVE_WARNINGS--}     
     
      {--SPONSOR_WARNING_INTERVAL--}:     
     
      + {--SPONSOR_PAYMENTS--}  
     
      {--SPONSOR_SELECT_PAYMENT--}:   $content[payment_list]  
     
      + {--SPONSOR_TERMS_HEADER--}  
     
      -   +   {--SPONSOR_ACCEPT_TERMS--}  
     
      +  
    +
    diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl index 1650b57fc6..60173f76ae 100644 --- a/templates/de/html/member/member_html_mail_settings.tpl +++ b/templates/de/html/member/member_html_mail_settings.tpl @@ -1,3 +1,4 @@ +
    @@ -10,10 +11,10 @@ @@ -24,3 +25,4 @@
    - {--YES--}:    + {--YES--}:  -   {--NO--}:  + {--NO--}: 
    +
    diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl index c3159db4bd..af97857625 100644 --- a/templates/de/html/member/member_nickname_form.tpl +++ b/templates/de/html/member/member_nickname_form.tpl @@ -1,48 +1,29 @@ +
    - +
    - - - - - - - - - + - + - - - - + - - - - - - - - - - - +
    {--NICKNAME_CHANGE_NICKNAME_TITLE--}
     
     {--NICKNAME_CHANGE_NICKNAME_INTRO--}  + {--NICKNAME_CHANGE_NICKNAME_TITLE--} +
     {--NICKNAME_CHANGE_NICKNAME_INTRO--}
      {--NICKNAME_ENTER_NICKNAME--}:   
     {--NICKNAME_ALLOWED_CHARS--} ({?nickname_chars?})
     {--NICKNAME_ALLOWED_CHARS--} ({?nickname_chars?}) 
     
        + + +
    +
    diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl index b04e5ab3b8..8f1c624220 100644 --- a/templates/de/html/member/member_order_page2.tpl +++ b/templates/de/html/member/member_order_page2.tpl @@ -1,113 +1,67 @@ +
    $content[zip_content] - - - - - - - - - - - - - - - - - - - - - - - - - - - $content[html_extension] - - - - - - - - - - - - - - - - - - - - - - - - +
     
      {--SELECT_MAIL_TYPE--}:   
     
      {--SELECT_CATEGORY--}:   
     
      {--ENTER_RECEIVER--}: Minimum: {?order_min?}    
     
      {--ENTER_SUBJECT--}:   
     
      {--ENTER_TEXT--}:   
     
      + {--MEMBER_PLEASE_NOTE--}  
     
      -
    -
      -
    1. Bitte prüfen Sie unbedingt vor dem Absenden die Verfügbarkeit und Framekiller-Freiheit ihrer beworbenen Adresse!
      2. -
    2. Unsere AGBs vergessen? [Hier sind sie nochmal].
      3. -
    3. Gesperrte URLs können nicht ein zweites Mal beworben werden.
      4. -
    4. Ihre Seite wird vor dem entgültigem Absenden auf Framekiller hin automatisch doppelt geprüft. Sollten Sie also nur Ihre beworbene Seite sehen, enthält diese einen Frame-Killer.
      5. -
    5. Ist Sponsor-Mail ausgewählt, wird die beworbene Seite nicht geladen, sondern eine neutrale Seite mit unseren Sponsor-Bannern!
      6. -
    6. Fremde {?mt_word3?} dürfen während der gesamten Startphase (bis 100 aktive Mitglieder) nicht mehr beworben werden und werden von uns abgelehnt!
      7. -
    -
    +     		+
    +
      +
    1. Bitte prüfen Sie unbedingt vor dem Absenden die Verfügbarkeit und Framekiller-Freiheit ihrer beworbenen Adresse!
      2. +
    2. Unsere AGBs vergessen? [Hier sind sie nochmal].
      3. +
    3. Gesperrte URLs können nicht ein zweites Mal beworben werden.
      4. +
    4. Ihre Seite wird vor dem entgültigem Absenden auf Framekiller hin automatisch doppelt geprüft. Sollten Sie also nur Ihre beworbene Seite sehen, enthält diese einen Frame-Killer.
      5. +
    5. Ist Sponsor-Mail ausgewählt, wird die beworbene Seite nicht geladen, sondern eine neutrale Seite mit unseren Sponsor-Bannern!
      6. +
    6. Fremde {?mt_word3?} dürfen während der gesamten Startphase (bis 100 aktive Mitglieder) nicht mehr beworben werden und werden von uns abgelehnt!
      7. +
    +
    		 
     
      {--MEMBER_ENTER_URL--}:   
        + + +
    +
    diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl index cdc75c103a..a0c9b0d48b 100644 --- a/templates/de/html/member/member_payout_form_banner.tpl +++ b/templates/de/html/member/member_payout_form_banner.tpl @@ -1,56 +1,45 @@ +
    - - - - - - - - - - - - + - - - - @@ -61,3 +50,4 @@
    (*): {--PAYOUT_BANNER_NOTE--}
    + -- 2.39.5 From bb9e6c92e9a012ad8890666da394e0e81cd3c96e Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 29 Nov 2009 10:54:23 +0000 Subject: [PATCH 09/16] generateMetaDescriptionCode() has now no longer parameters --- inc/functions.php | 17 ++++++++++++++++- inc/mysql-manager.php | 15 --------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 62aa009248..b61e863c5c 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -3947,7 +3947,7 @@ function loadHtmlHeader () { // Add meta description to header if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { // Add meta description not in admin and login module and when the script is installed - generateMetaDescriptionCode(getModule(), getWhat()); + generateMetaDescriptionCode(); } // END - if } // END - if @@ -3967,6 +3967,21 @@ function addPageHeaderFooter () { $GLOBALS['output'] = $GLOBALS['page_header'] . $GLOBALS['output'] . $GLOBALS['page_footer']; } +// Generates meta description for current module and 'what' value +function generateMetaDescriptionCode () { + // Only include from guest area + if (getModule() == 'index') { + // Construct dynamic description + $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', getWhat()); + + // Output it directly + $GLOBALS['page_header'] .= ''; + } // END - if + + // Remove depth + unset($GLOBALS['ref_level']); +} + ////////////////////////////////////////////////// // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // ////////////////////////////////////////////////// diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index f6d0955d57..30aa831a00 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1673,21 +1673,6 @@ WHERE SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__); } -// Generates meta description for given module and 'what' value -function generateMetaDescriptionCode ($module, $what) { - // Only include from guest area - if ($module == 'index') { - // Construct dynamic description - $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what); - - // Output it directly - $GLOBALS['page_header'] .= ''; - } // END - if - - // Remove depth - unset($GLOBALS['ref_level']); -} - // Gets the matching what name from module function getWhatFromModule ($modCheck) { // Is the request element set? -- 2.39.5 From 6ee38677bd24cd74b4366bb2ccf1bbd93afbe957 Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 29 Nov 2009 14:44:05 +0000 Subject: [PATCH 10/16] Fixes for 'empty extension version bug' --- inc/classes/cachesystem.class.php | 4 ++-- inc/extensions-functions.php | 4 ++-- inc/filter-functions.php | 2 +- inc/header.php | 3 +++ inc/modules/admin/admin-inc.php | 2 +- inc/modules/admin/overview-inc.php | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index 4c23235ac2..e2640ed3d7 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -89,8 +89,8 @@ class CacheSystem { // Pre-fetch cache here if found if ($this->isCacheReadable()) $this->getArrayFromCache(); - //* DEBUG: */ print($cacheName.'='.intval($this->isCacheReadable()).'/'.intval(is_writeable($this->fqfn)).'/'.intval($this->extensionVersionMatches('cache')).'
    '); - $this->status[$cacheName] = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && ($this->extensionVersionMatches('cache'))); + //* DEBUG: */ print($cacheName.'='.intval($this->isCacheReadable()).'/'.intval(is_writeable($this->fqfn)).'/'.intval(isExtensionInstalled('cache')).'/'.intval($this->extensionVersionMatches('cache')).'
    '); + $this->status[$cacheName] = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && (isExtensionInstalled('cache')) && ($this->extensionVersionMatches('cache'))); } // END - if //* DEBUG: */ print($cacheName.'='.intval($this->status[$cacheName]).'
    '); diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index c73a57fe4c..b3421876b5 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -682,7 +682,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false $OUT = ''; // Do we have queries? - if ((getExtensionVersion('sql_patches') >= '0.0.7') && (getConfig('verbose_sql') == 'Y')) { + if ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) { // Init switch color $SW = 2; @@ -721,7 +721,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false // Load main template $OUT = loadTemplate('admin_ext_sql_table', true, $content); - } elseif ((getExtensionVersion('sql_patches') >= '0.0.7') && (getConfig('verbose_sql') == 'Y')) { + } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) { // No addional SQL commands to run $OUT = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_ADDITIONAL_SQLS')); } // END - if diff --git a/inc/filter-functions.php b/inc/filter-functions.php index d096c8e43b..5088da4b23 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -118,9 +118,9 @@ ORDER BY // Init filters registerFilter('init', 'LOAD_CONFIGURATION'); + registerFilter('init', 'LOAD_RUNTIME_INCLUDES'); registerFilter('init', 'INIT_EXTENSIONS'); registerFilter('init', 'INIT_RANDOMIZER'); - registerFilter('init', 'LOAD_RUNTIME_INCLUDES'); registerFilter('init', 'INIT_RANDOM_NUMBER'); registerFilter('init', 'CHECK_SVN_REVISION'); registerFilter('init', 'RUN_DAILY_RESET'); diff --git a/inc/header.php b/inc/header.php index d87acc2edd..8fa1486a72 100644 --- a/inc/header.php +++ b/inc/header.php @@ -43,6 +43,9 @@ if (!defined('__SECURITY')) { die(); } // END - if +// Init header +$GLOBALS['page_header'] = ''; + // Is the header already sent? if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) { // If not in CSS mode generate the header diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 47d8c45e2d..76499f3675 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -197,7 +197,7 @@ function ifAdminLoginDataIsValid ($admin, $password) { // Try to login the admin by setting some session/cookie variables function doAdminLogin ($adminLogin, $passHash) { // Reset failure counter on matching admins version - if ((isExtensionInstalledAndNewer('admins', '0.7.0')) && ((isExtensionOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) { + if ((isExtensionInstalledAndNewer('admins', '0.7.0')) && ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) { // Reset counter on out-dated sql_patches version SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `login_failures`=0, `last_failure`='0000-00-00 00:00:00' WHERE `login`='%s' LIMIT 1", array($adminLogin), __FUNCTION__, __LINE__); diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 0b8b56becd..9586233e83 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -242,9 +242,9 @@ LIMIT 1", } // Add SQLs to a table - if ((!empty($ext_name)) && (getExtensionVersion('sql_patches')) && (getConfig('verbose_sql') == 'Y')) { + if ((!empty($ext_name)) && (isExtensionInstalled('sql_patches')) && (getConfig('verbose_sql') == 'Y')) { // Add verbose SQL table - $text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top left right\"", true, '100%') . "
    \n"; + $text .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . "
    \n"; } // END - if } elseif ((!empty($ext_name)) && (!empty($ext_ver))) { // Run SQL commands in dry mode but only return the notes -- 2.39.5 From 2bef48dd548b668442873e9b506e43293f00ed06 Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 29 Nov 2009 14:47:21 +0000 Subject: [PATCH 11/16] This wasn't the fix... --- inc/classes/cachesystem.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index e2640ed3d7..4c23235ac2 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -89,8 +89,8 @@ class CacheSystem { // Pre-fetch cache here if found if ($this->isCacheReadable()) $this->getArrayFromCache(); - //* DEBUG: */ print($cacheName.'='.intval($this->isCacheReadable()).'/'.intval(is_writeable($this->fqfn)).'/'.intval(isExtensionInstalled('cache')).'/'.intval($this->extensionVersionMatches('cache')).'
    '); - $this->status[$cacheName] = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && (isExtensionInstalled('cache')) && ($this->extensionVersionMatches('cache'))); + //* DEBUG: */ print($cacheName.'='.intval($this->isCacheReadable()).'/'.intval(is_writeable($this->fqfn)).'/'.intval($this->extensionVersionMatches('cache')).'
    '); + $this->status[$cacheName] = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && ($this->extensionVersionMatches('cache'))); } // END - if //* DEBUG: */ print($cacheName.'='.intval($this->status[$cacheName]).'
    '); -- 2.39.5 From f13b373c478c1cbaf0e98eff4e44a46b4c721d72 Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 30 Nov 2009 17:15:11 +0000 Subject: [PATCH 12/16] Fixes for missing array elements --- inc/functions.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/inc/functions.php b/inc/functions.php index b61e863c5c..9e185ab1b5 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -945,6 +945,9 @@ function redirectToUrl ($URL) { // Secure the URL against bad things such als HTML insertions and so on... $URL = secureString($URL); + // Set content-type here to fix a missing array element + setContentType('text/html'); + // Output new location link as anchor outputHtml('' . $URL . ''); } elseif (!headers_sent()) { @@ -3963,8 +3966,17 @@ function loadHtmlHeader () { // Adds page header and footer to output array element function addPageHeaderFooter () { + // Init output + $OUT = ''; + // Add them all together. This is maybe to simple - $GLOBALS['output'] = $GLOBALS['page_header'] . $GLOBALS['output'] . $GLOBALS['page_footer']; + foreach (array('page_header', 'output', 'page_footer') as $pagePart) { + // Add page part if set + if (isset($GLOBALS[$pagePart]])) $OUT .= $GLOBALS[$pagePart]; + } // END - foreach + + // Transfer $OUT to 'output' + $GLOBALS['output'] = $OUT; } // Generates meta description for current module and 'what' value -- 2.39.5 From 50cdbe3d6f1ee3bccae4db58f292226db5108c2d Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 30 Nov 2009 17:17:16 +0000 Subject: [PATCH 13/16] Fix for fix --- inc/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/functions.php b/inc/functions.php index 9e185ab1b5..14630ab3b4 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -3972,7 +3972,7 @@ function addPageHeaderFooter () { // Add them all together. This is maybe to simple foreach (array('page_header', 'output', 'page_footer') as $pagePart) { // Add page part if set - if (isset($GLOBALS[$pagePart]])) $OUT .= $GLOBALS[$pagePart]; + if (isset($GLOBALS[$pagePart])) $OUT .= $GLOBALS[$pagePart]; } // END - foreach // Transfer $OUT to 'output' -- 2.39.5 From c7d8edfd62a803cf023f396e73de97de1480f6dd Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 30 Nov 2009 18:24:22 +0000 Subject: [PATCH 14/16] Fixes for sometimes over-hashed passwords --- inc/autopurge/purge-mails.php | 10 ++++---- inc/autopurge/purge-tsks.php | 8 +++--- inc/functions.php | 44 +++++++++++++++++++-------------- inc/modules/admin/admin-inc.php | 2 +- inc/mysql-manager.php | 9 +++++-- 5 files changed, 43 insertions(+), 30 deletions(-) diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php index a2f0ade9a9..2a2df0f17a 100644 --- a/inc/autopurge/purge-mails.php +++ b/inc/autopurge/purge-mails.php @@ -58,7 +58,7 @@ ORDER BY `sender` ASC", __FILE__, __LINE__); // Reset counter... -$DELETED = '0'; +$deletedStats = '0'; // Do we have "purged" mails? if (SQL_NUMROWS($result_mails) > 0) { @@ -69,7 +69,7 @@ if (SQL_NUMROWS($result_mails) > 0) { // Okay we found some mails! SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `sender`=%s", array(bigintval($content['sender'])), __FILE__, __LINE__); - $DELETED += SQL_AFFECTEDROWS(); + $deletedStats += SQL_AFFECTEDROWS(); // Reset query (to prevent possible errors) ...; $result_mails = SQL_QUERY("SELECT @@ -106,7 +106,7 @@ if (SQL_NUMROWS($result_mails) > 0) { // Okay we found some mails! SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `sender`=%s", array(bigintval($content['sender'])), __FILE__, __LINE__); - $DELETED += SQL_AFFECTEDROWS(); + $deletedStats += SQL_AFFECTEDROWS(); // Reset query (to prevent possible errors) ... $result_mails = SQL_QUERY("SELECT @@ -125,9 +125,9 @@ ORDER BY SQL_FREERESULT($result_mails); // Do we have deleted mails and the admin want's to receive a notification -if (($DELETED > 0) && (getConfig('ap_dm_notify') == 'Y')) { +if (($deletedStats > 0) && (getConfig('ap_dm_notify') == 'Y')) { // Send out email to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $DELETED, ''); + sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $deletedStats, ''); } // END - if // diff --git a/inc/autopurge/purge-tsks.php b/inc/autopurge/purge-tsks.php index 04acbb5e0a..d39f7f1981 100644 --- a/inc/autopurge/purge-tsks.php +++ b/inc/autopurge/purge-tsks.php @@ -48,7 +48,7 @@ if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y') } // END - if // Check version (must be > 0.0) -if ((getExtensionVersion('task') > '0.0') && (getConfig('autopurge_tasks') == 'Y')) { +if ((isExtensionInstalledAndNewer('task') > '0.0') && (getConfig('autopurge_tasks') == 'Y')) { // Purge deleted tasks (no notification to admin) SQL_QUERY("DELETE LOW_PRIORITY FROM @@ -57,12 +57,12 @@ WHERE `status`='DELETED' AND `task_created` <= (UNIX_TIMESTAMP() - {?ap_tasks_time?})", __FILE__, __LINE__); // Get deleted rows - $DELETED = SQL_AFFECTEDROWS(); + $deletedTasks = SQL_AFFECTEDROWS(); // Do we need to send a notification? - if (($DELETED > 0) && (getConfig('ap_tasks_notify') == 'Y')) { + if (($deletedTasks > 0) && (getConfig('ap_tasks_notify') == 'Y')) { // Send out email to admin - sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TASKS_SUBJECT'), "admin_autopurge_tsks", $DELETED, ''); + sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TASKS_SUBJECT'), 'admin_autopurge_tsks', $deletedTasks, ''); } // END - if } // END - if diff --git a/inc/functions.php b/inc/functions.php index 14630ab3b4..921cda0aea 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2074,11 +2074,17 @@ function generateEmailLink ($email, $table = 'admins') { } // Generate a hash for extra-security for all passwords -function generateHash ($plainText, $salt = '') { +function generateHash ($plainText, $salt = '', $hash = true) { // Is the required extension 'sql_patches' there and a salt is not given? if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) && (empty($salt))) { // Extension sql_patches is missing/outdated so we hash the plain text with MD5 - return md5($plainText); + if ($hash === true) { + // Is plain password + return md5($plainText); + } else { + // Is already a hash + return $plainText; + } } // END - if // Do we miss an arry element here? @@ -2218,35 +2224,37 @@ function generatePassString ($passHash) { $ret = $passHash; // Is a secret key and master salt already initialized? - if ((isExtensionInstalled('sql_patches')) && (isExtensionInstalledAndNewer('other', '0.2.5')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { + if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { // Only calculate when the secret key is generated + if (strlen($passHash) != getConfig('secret_key')) { + // Both keys must have same length + debug_report_bug('Hash lengths do not match! (' . strlen($passHash) . '!=' . strlen(getConfig('secret_key')) . ')'); + } // END - if + $newHash = ''; $start = 9; - for ($idx = '0'; $idx < 10; $idx++) { - $part1 = hexdec(substr($passHash, $start, 4)); - $part2 = hexdec(substr(getConfig('secret_key'), $start, 4)); + //* DEBUG: */ outputHtml('passHash=' . $passHash . '(' . strlen($passHash) . ')
    '); + for ($idx = 0; $idx < 20; $idx++) { + $part1 = hexdec(substr($passHash, ($idx * 2), 2)); + $part2 = hexdec(substr(getConfig('secret_key'), $start, 2)); + //* DEBUG: */ outputHtml('part1='.$part1.'/part2='.$part2.'
    '); $mod = dechex($idx); if ($part1 > $part2) { $mod = dechex(sqrt(($part1 - $part2) * getConfig('_PRIME') / pi())); } elseif ($part2 > $part1) { $mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi())); } - $mod = substr($mod, 0, 4); + $mod = substr($mod, 0, 2); //* DEBUG: */ outputHtml('part1='.$part1.'/part2='.$part2.'/mod=' . $mod . '('.strlen($mod).')
    '); - $mod = str_repeat(0, (4 - strlen($mod))) . $mod; - //* DEBUG: */ outputHtml('*' . $start . '=' . $mod . '*
    '); - $start += 4; + $mod = str_repeat(0, (2 - strlen($mod))) . $mod; + //* DEBUG: */ outputHtml('mod(' . ($idx * 2) . ')=' . $mod . '*
    '); + $start += 2; $newHash .= $mod; } // END - for - //* DEBUG: */ print($passHash.'
    ' . $newHash." (".strlen($newHash).')
    '); + //* DEBUG: */ print($passHash . '
    ' . $newHash . ' (' . strlen($newHash) . ')
    '); $ret = generateHash($newHash, getConfig('master_salt')); - //* DEBUG: */ print('ret='.$ret.'
    '); - } else { - // Hash it simple - //* DEBUG: */ outputHtml("--" . $passHash."--
    "); - $ret = md5($passHash); - //* DEBUG: */ outputHtml("++" . $ret."++
    "); - } + //* DEBUG: */ print('ret=' . $ret . '
    '); + } // END - if // Return result return $ret; diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 76499f3675..76e4a85d13 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -208,7 +208,7 @@ function doAdminLogin ($adminLogin, $passHash) { // Now set all session variables and return the result return (( - setSession('admin_md5', generatePassString($passHash)) + setSession('admin_md5', generatePassString(generateHash($passHash, '', false))) ) && ( setSession('admin_login', $adminLogin) ) && ( diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 30aa831a00..178a027606 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -695,7 +695,9 @@ function fetchUserData ($userid, $column = 'userid') { // This patched function will reduce many SELECT queries for the specified or current admin login function isAdmin ($admin = '') { // Init variables - $ret = false; $passCookie = ''; $valPass = ''; + $ret = false; + $passCookie = ''; + $valPass = ''; //* DEBUG: */ print(__FUNCTION__.':'.$admin.'
    '); // If admin login is not given take current from cookies... @@ -724,9 +726,12 @@ function isAdmin ($admin = '') { // Count cache hits incrementStatsEntry('cache_hits'); - } elseif ((!empty($admin)) && ((!isExtensionActive('cache'))) || (isAdminHashSet($admin) === false)) { + } elseif ((!empty($admin)) && ((!isExtensionActive('cache')) || (isAdminHashSet($admin) === false))) { // Get admin hash and hash it $valPass = generatePassString(getAdminHash($admin)); + + // Cache it away + $GLOBALS['admin_hash'] = $valPass; } if (!empty($valPass)) { -- 2.39.5 From 4ac4d5060240609c589d59ded9dae14ce7bedf55 Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 30 Nov 2009 18:26:56 +0000 Subject: [PATCH 15/16] debug_report_bug() was to strict here --- inc/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 921cda0aea..e3d3f20f8c 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2227,8 +2227,8 @@ function generatePassString ($passHash) { if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { // Only calculate when the secret key is generated if (strlen($passHash) != getConfig('secret_key')) { - // Both keys must have same length - debug_report_bug('Hash lengths do not match! (' . strlen($passHash) . '!=' . strlen(getConfig('secret_key')) . ')'); + // Both keys must have same length so return unencrypted + return $ret; } // END - if $newHash = ''; $start = 9; -- 2.39.5 From 13ba149a32bc7b67a1c61969d49df5591fd631d9 Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 30 Nov 2009 19:15:18 +0000 Subject: [PATCH 16/16] Fix --- inc/modules/admin/what-unlock_emails.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php index 9dc0209a74..71926397d8 100644 --- a/inc/modules/admin/what-unlock_emails.php +++ b/inc/modules/admin/what-unlock_emails.php @@ -193,7 +193,7 @@ LIMIT 1", // Output message loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED')); - } elseif ((!isPostRequestParameterSet('lock')) && (!isPostRequestParameterSet('accept')) && (!isPostRequestParameterSet(('reject'))) && (getConfig('url_blacklist') == 'Y')) { + } elseif ((!isPostRequestParameterSet('lock')) && (!isPostRequestParameterSet('accept')) && (!isPostRequestParameterSet('reject'))) { // Mail orders are in pool so we can display them $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_main)) { -- 2.39.5
    + {--PAYOUT_NOW_TITLE--}
     
    {--PAYOUT_SELECTED_TYPE--}:  $content[type]
    {--PAYOUT_MAX_PAYOUT--}:  $content[max]
    {--PAYOUT_WANT_PAYOUT--}: 
    {--PAYOUT_TARGET_URL--}: 
    {--PAYOUT_ALTERNATE_TEXT--}: 
    {--PAYOUT_OPTIONAL_BANNER--}:  -  (*) + {--PAYOUT_OPTIONAL_BANNER--}: + (*)
     
    +