Legacy comments removed, description for ext-network expanded:

- Some legacy comments removed, they belong to a much older version of this
  script and are no longer valid, but still we would recommend you to remove
  at least install.php
- Description text for extension ext-network heavily expanded, planed V-Check
  support noted
- Some old-lost code refactured
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index a3b35ecba6eac5a00e4cd2ae5343cde2a86ea3e7..4df353b271e3ad708f53711bef4403dffadc01d4 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -713,6 +713,7 @@ install/tables.sql -text
 /mailid.php -text svneol=unset#text/plain
 /mailid_top.php -text svneol=unset#text/plain
 /modules.php -text svneol=unset#text/plain
+/network-check.php svneol=native#text/plain
 /ref.php -text svneol=unset#text/plain
 /robots.txt -text svneol=unset#text/plain
 /show_bonus.php -text svneol=unset#text/plain

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 209039d67b81a839ef815adc82383d1274b5fd00..3290830a29b8610ce598b2dc2c75e2d6fc2a6c3c 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -48,7 +48,7 @@
 ./inc/functions.php:178:// @TODO Rewrite this to an extension 'smtp'
 ./inc/functions.php:2251:      // @TODO This is still very static, rewrite it somehow
 ./inc/gen_sql_patches.php:96:// @TODO Rewrite this to a filter
-./inc/install-functions.php:63:        // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
+./inc/install-functions.php:59:        // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
 ./inc/language/de.php:1127:// @TODO Rewrite these two constants
 ./inc/language/de.php:1142:// @TODO Rewrite these three constants
 ./inc/language/de.php:301:     // @TODO Following two are unused?
@@ -136,7 +136,7 @@
 ./inc/modules/admin/what-list_user.php:257:            // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:300:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:59:// @TODO Rewrite these if-blocks in a filter
-./inc/modules/admin/what-logs.php:69:                  // @TODO Fix content-type here
+./inc/modules/admin/what-logs.php:66:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:72:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:126:                              // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-mem_add.php:65:               // @TODO Cant this be rewritten?
@@ -199,6 +199,7 @@
 ./mailid_top.php:188:                                                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:223:                                                                  // @TODO Rewrite these blocks to filter
 ./mailid_top.php:256:                                                                          // @TODO Try to rewrite the following unset()
+./network-check.php:56:// @TODO Add processing of request here
 ./show_bonus.php:107:                  // @TODO No more needed? $content['points'] = translateComma($content['points']);
 ./view.php:70:         // @TODO No banner found, output some default banner
 ./templates/de/html/admin/admin_add_country.tpl:23:                    <!-- @TODO Rewrite this selection box to our generic functions //-->
@@ -234,6 +235,10 @@
 ./templates/de/html/admin/admin_amenu_edit_form.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_amenu_edit_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_amenu_edit.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_del_points_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_del_points.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_edit_points_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_edit_points.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_gmenu_delete_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_gmenu_delete.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_gmenu_edit_form.tpl:1:<!-- @DEPRECATED //-->
@@ -253,6 +258,8 @@
 ./templates/de/html/admin/admin_points_del.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_points_edit_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_points_edit.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_points_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_points.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_refbanner_edit_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_refbanner_edit.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_refbanner_row.tpl:1:<!-- @DEPRECATED //-->

diff --git a/inc/install-functions.php b/inc/install-functions.php
index 4d7059a11f56d31d5d0b5c623887b611f8d6886d..4f9d8c0da1ce35deb978f37f314e0b50d1131aa4 100644 (file)
--- a/inc/install-functions.php
+++ b/inc/install-functions.php
@@ -37,10 +37,6 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-/************************************************************************
- *      YOU MAY ALSO WANT TO REMOVE THIS FILE AFTER INSTALLTION!        *
- ************************************************************************/
-
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index bc0c597d0894348b21859ef0aa8eaf2d839fcf4b..590242e06832b08ad6063c096dc306dd6fb429cb 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -55,26 +55,26 @@ if (isGetRequestParameterSet('access')) {
                // Load it directly
                $content = readFromFile($target);
 
-               // Save old content
-               $OUTPUT = ob_get_contents();
-
-               // Clean content
-               clearOutputBuffer();
-
                // Set header
                if (substr($access, -3, 3) == 'log') {
                        // Output header
                        sendHeader('Content-Type: text/plain');
+
+                       // Clean content
+                       clearOutputBuffer();
                } elseif (substr($access, -3, 3) == '.gz') {
                        // @TODO Fix content-type here
                        sendHeader('Content-Type: text/plain');
+
+                       // Clean content
+                       clearOutputBuffer();
                } elseif (substr($access, -3, 3) == '.bz2') {
                        // @TODO Fix content-type here
                        sendHeader('Content-Type: text/plain');
-               } else {
-                       // Restore old content
-                       outputHtml($OUTPUT);
 
+                       // Clean content
+                       clearOutputBuffer();
+               } else {
                        // Output message
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT', $access));
                        return;
@@ -94,10 +94,7 @@ if (isGetRequestParameterSet('access')) {
                outputHtml('<ol>');
 
                // Read all files
-               $files = getArrayFromDirectory(getConfig('logs_base'), 'access');
-
-               // And walk through them
-               foreach ($files as $file) {
+               foreach (getArrayFromDirectory(getConfig('logs_base'), 'access') as $file) {
                        // Cut dirname away
                        $file = basename($file);
 

diff --git a/install.php b/install.php
index f0e6ff308da6e681ddf8f60f8f3ed791b7c8e5bc..3d0ca7914143bcf3a7828e2eafa2b5c65be750b5 100644 (file)
--- a/install.php
+++ b/install.php
@@ -6,19 +6,9 @@
  * -------------------------------------------------------------------- *
  * File              : install.php                                      *
  * -------------------------------------------------------------------- *
- *                                                                      *
- *          ------------------------------------------------            *
- *         / PLEASE READ THIS!  /  BITTE LESEN SIE DIESES! /            *
- *        -------------------------------------------------             *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * Short description : Installation script. Please delete this file     *
- *           after successfully installation or ANYONE can re-setup     *
- *           your mail exchange script!!!                               *
+ * Short description : Installation script.                             *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Installationsscript. Bitte loeschen Sie diese    *
- *           Datei nach der fertiggestellten Installation oder JEDER    *
- *           kann Ihr Mailtausch-Script eventuell neu einstellen.       *
+ * Kurzbeschreibung  : Installationsscript.                             *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *

diff --git a/network-check.php b/network-check.php
new file mode 100644 (file)
index 0000000..2fd8e5d
--- /dev/null
+++ b/network-check.php
@@ -0,0 +1,62 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 07/22/2010 *
+ * ===================                          Last change: 07/22/2010 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : network-check.php                                *
+ * -------------------------------------------------------------------- *
+ * Short description : Check script for network extension               *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : V-Check Script fuer Erweiterung network          *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Load security stuff here
+require('inc/libs/security_functions.php');
+
+// Set module
+$GLOBALS['module'] = 'network-check';
+$GLOBALS['output_mode'] = -1;
+
+// Load the required file(s)
+require('inc/config-global.php');
+
+// Set content type
+setContentType('text/plain');
+
+// Load header
+loadIncludeOnce('inc/header.php');
+
+// @TODO Add processing of request here
+
+// Load footer
+loadIncludeOnce('inc/footer.php');
+
+// [EOF]
+?>

diff --git a/templates/de/html/ext/ext_network.tpl b/templates/de/html/ext/ext_network.tpl
index f33d98493a45a3325e0df10e9f787c53e6f9c1de..7e414a33e922c0970c10048bc05c491dadb33d32 100644 (file)
--- a/templates/de/html/ext/ext_network.tpl
+++ b/templates/de/html/ext/ext_network.tpl
@@ -1,6 +1,39 @@
-Diese Erweiterung bietet eine allgemeine Anbindungsmöglichkeit an diverese
-Werbenetzwerken an, um z.B. deren Mails zu versenden. Später sollen
-noch weitere Dinge, wie Textlinks oder Popups folgen. Sollte ein
-Werbenetzwerk hier fehlen, melden Sie sich bitte <a target="_blank"
- href="http://forum.mxchange.org/topic-462.html" rel="external">im Forum</a> an.
-Mein Team und ich binden es dann bald im Mailer-Projekt ein.
+<div class="para">
+       Ein {?mt_word?} lebt von Sponsoren (sei es direkt angemeldete - dazu nutzen
+       Sie bitte ext-sponsor - oder &uuml;ber Werbenetzwerke angeworbene), da auch
+       irgentwo die Kosten (Domain-, Serverkosten und mehr) gedeckt werden
+       m&uuml;ssen.
+</div>
+
+<div class="para">
+       Beispielsweise sind Sie bei 20 (oder gar mehr) Werbenetzwerken angemeldet.
+       Dass Sie dort nicht &uuml;berall manuell die Links mit Werbetext und
+       Betreffzeile rauskopieren k&ouml;nnen, da es zu m&uuml;hevoll w&auml;r, ist
+       vollkommen klar. Genau hier hilft Ihnen diese Erweiterung weiter, indem es
+       die Werbtexte, Klick-URL (die Sie bewerben sollen) und vieles mehr von den
+       einzelnen Werbenetzwerken &uuml;ber das Interface abfragt.
+</div>
+
+<div class="para">
+       Diese Erweiterung ist allgemeing&uuml;ltig und sollte somit zu
+       m&ouml;glichst allen Werbenetzwerken kompatibel sein. Sie brauchen also nur
+       Ihre Interface-Zugangsdaten (meistens Ihre User-Id, Seiten-Id und
+       Interface-Passwort) im Adminmen&uuml; eintragen und schon k&ouml;nnen die
+       Kampagnen aus dem Werbenetzwerk zu diesem {?mt_word?} &uuml;bertragen
+       werden, Sie machen dazu nur wenige Klicks und brauchen keine Werbetexte oder
+       URLs umst&auml;ndlich kopieren.
+</div>
+
+<div class="para">
+       <strong>Noch in Planung:</strong> Einige Werbenetzwerke bietet die
+       M&ouml;glichkeit eines V-Checks an. Dabei wird &uuml;berpr&uuml;ft, ob auch
+       die beworbene URL aufgerufen wurde und wird dann an Ihren {?mt_word?} bei
+       korrektem Aufruf zur&uuml;ckgemeldet.
+</div>
+
+<div class="para">
+       Sollte ein Werbenetzwerk (nur welche mit Interface werden unterst&uuml;tzt)
+       fehlen, melden Sie es bitte <a target="_blank"
+ href="http://forum.mxchange.org/topic-462.html" rel="external">in diesem
+       Forum</a>. Mein Team und ich binden es dann bald im Mailer-Projekt ein.
+</div>