Conflict solved between ext-profile and ext-update
authorRoland Häder <roland@mxchange.org>
Wed, 28 Oct 2009 03:45:29 +0000 (03:45 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 28 Oct 2009 03:45:29 +0000 (03:45 +0000)
.gitattributes
inc/extensions/ext-update.php [new file with mode: 0644]
inc/libs/security_functions.php
inc/modules/member/what-welcome.php
templates/de/html/ext/ext_update.tpl [new file with mode: 0644]
templates/de/html/member/member_profile_outdated.tpl [new file with mode: 0644]
templates/de/html/profile-update.tpl

index 9a3d288..c9e2f7e 100644 (file)
@@ -166,6 +166,7 @@ inc/extensions/ext-theme.php -text
 inc/extensions/ext-top10.php -text
 inc/extensions/ext-transfer.php -text
 inc/extensions/ext-uberwach.php -text
+inc/extensions/ext-update.php -text
 inc/extensions/ext-usage.php -text
 inc/extensions/ext-user.php -text
 inc/extensions/ext-wernis.php -text
@@ -1297,6 +1298,7 @@ templates/de/html/ext/ext_theme.tpl -text
 templates/de/html/ext/ext_top10.tpl -text
 templates/de/html/ext/ext_transfer.tpl -text
 templates/de/html/ext/ext_uberwach.tpl -text
+templates/de/html/ext/ext_update.tpl -text
 templates/de/html/ext/ext_usage.tpl -text
 templates/de/html/ext/ext_user.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
@@ -1469,6 +1471,7 @@ templates/de/html/member/member_pool_table.tpl -text
 templates/de/html/member/member_primera_mode_list.tpl -text
 templates/de/html/member/member_primera_mode_list_row.tpl -text
 templates/de/html/member/member_primera_mode_pay.tpl -text
+templates/de/html/member/member_profile_outdated.tpl -text
 templates/de/html/member/member_receive_table.tpl -text
 templates/de/html/member/member_ref_list.tpl -text
 templates/de/html/member/member_ref_list_level.tpl -text
diff --git a/inc/extensions/ext-update.php b/inc/extensions/ext-update.php
new file mode 100644 (file)
index 0000000..fcf30e7
--- /dev/null
@@ -0,0 +1,93 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 10/28/2009 *
+ * ================                             Last change: 10/28/2009 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : ext-update.php                                   *
+ * -------------------------------------------------------------------- *
+ * Short description : An extension for regulary update checks          *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Eine Erweiterung zum regelm. Pruefen v. Updates  *
+ * -------------------------------------------------------------------- *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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                           *
+ * 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                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Version number
+setThisExtensionVersion('0.0');
+
+// Version history array (add more with , '0.1.0' and so on)
+setExtensionVersionHistory(array('0.0'));
+
+switch (getExtensionMode()) {
+       case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+               // SQL commands to run
+               break;
+
+       case 'remove': // Do stuff when removing extension
+               // SQL commands to run
+               break;
+
+       case 'activate': // Do stuff when admin activates this extension
+               // SQL commands to run
+               break;
+
+       case 'deactivate': // Do stuff when admin deactivates this extension
+               // SQL commands to run
+               break;
+
+       case 'update': // Update an extension
+               switch (getCurrentExtensionVersion()) {
+                       case '0.0.1': // SQL queries for v0.0.1
+                               addExtensionSql('');
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes('');
+                               break;
+               } // END - switch
+               break;
+
+       case 'modify': // When the extension got modified
+               break;
+
+       case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+               break;
+
+       case 'init': // Do stuff when extension is initialized
+               break;
+
+       default: // Unknown extension mode
+               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode()));
+               break;
+} // END - switch
+
+// [EOF]
+?>
index 3922624..ba081bd 100644 (file)
@@ -162,25 +162,25 @@ if (phpversion() >= '4.0.4pl1' && (strstr(getenv('HTTP_USER_AGENT'),'compatible'
 $_SERVER['PHP_SELF'] = secureString($_SERVER['PHP_SELF']);
 
 // Split it up into path and filename
-$SELF_DIR  = dirname($_SERVER['PHP_SELF']);
-$SELF_FILE = basename($_SERVER['PHP_SELF']);
+$phpSelfDirectory = dirname($_SERVER['PHP_SELF']);
+$phpSelfFile      = basename($_SERVER['PHP_SELF']);
 
-// Check for a .php inside the $SELF_DIR...
-while (ereg('.php', $SELF_DIR)) {
+// Check for a .php inside the $phpSelfDirectory...
+while (ereg('.php', $phpSelfDirectory)) {
        // Correct the dirname
-       $SELF_DIR = substr($SELF_DIR, 0, (strpos($SELF_DIR, '.php') + 4));
+       $phpSelfDirectory = substr($phpSelfDirectory, 0, (strpos($phpSelfDirectory, '.php') + 4));
        // Rewrite filename...
-       $SELF_FILE = basename($SELF_DIR);
+       $phpSelfFile = basename($phpSelfDirectory);
        // ... and dirname
-       $SELF_DIR = dirname($SELF_DIR);
+       $phpSelfDirectory = dirname($phpSelfDirectory);
 } // END - while
 
 // Put both together again and let's pray it is secured now...
-$_SERVER['PHP_SELF'] = $SELF_DIR . '/' . $SELF_FILE;
+$_SERVER['PHP_SELF'] = $phpSelfDirectory . '/' . $phpSelfFile;
 
 // Remove uneccessary variables
-unset($SELF_DIR);
-unset($SELF_FILE);
+unset($phpSelfDirectory);
+unset($phpSelfFile);
 
 // Security system loaded...
 define('__SECURITY', '1');
index 76e2541..0bf919b 100644 (file)
@@ -61,7 +61,7 @@ $result = SQL_QUERY_ESC("SELECT userid FROM `{?_MYSQL_PREFIX?}_user_data` WHERE
 
 if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('profile'))) {
        // Yes, he is so let's place him his wanted buttons
-       loadTemplate('profile-update');
+       loadTemplate('member_profile_outdated');
 } else {
        // Load the template below this default data
        loadTemplate('member_welcome');
diff --git a/templates/de/html/ext/ext_update.tpl b/templates/de/html/ext/ext_update.tpl
new file mode 100644 (file)
index 0000000..1da00b0
--- /dev/null
@@ -0,0 +1,4 @@
+Diese Erweiterung pr&uuml;ft im regelm&auml;&szlig;igen Abstand nach Updates auf
+dem MXChange-Server und wird Sie wahlweise per Mail oder per PopUp-Fenster im
+Adminbereich (oder beides zusammen) benachrichtigen, sobald eine neuere Revision
+verf&uuml;gbar ist.
diff --git a/templates/de/html/member/member_profile_outdated.tpl b/templates/de/html/member/member_profile_outdated.tpl
new file mode 100644 (file)
index 0000000..eaa2761
--- /dev/null
@@ -0,0 +1,47 @@
+<table border="0" cellspacing="0" cellpadding="0" width="90%" class="member_update">
+       <tr>
+               <td colspan="2" height="10" class="seperator top2 left2 right2">&nbsp;</td>
+       </tr>
+       <tr>
+               <td colspan="2" class="left2 right2" align="center">
+               <table border="0" cellspacing="0" cellpadding="0" width="100%" class="member_update" align="center">
+                       <tr>
+                               <td width="10" class="seperator">&nbsp;</td>
+                               <td align="left">
+                               <div align="center"><strong>Vielen Dank, dass Sie uns
+                               auf dem Laufenden halten wollen!</strong></div>
+                               <br />
+                               Wenn Sie jetzt Ihr Profil aktualisieren wollen, klicken Sie einfach
+                               unten auf den Button. War unsere Benachrichtigung ein Irrtum, so
+                               k&ouml;nnen Sie mit einem Klick die Benachrichtigung abschalten. Sie
+                               werden dann f&uuml;r l&auml;ngere Zeit von unserem System keine
+                               Benachrichtigungen erhalten.<br />
+                               <br />
+                               Bitte haben Sie nochmals f&uuml;r diese Massnahme Verst&auml;ndnis.
+                               Auch wir m&ouml;chten aktuelle Daten haben, damit wir unseren
+                               {?mt_word?} reibungslos betreiben k&ouml;nnen und es kommt auch
+                               unseren Werbekunden zugute.</td>
+                               <td width="10" class="seperator">&nbsp;</td>
+                       </tr>
+               </table>
+               </td>
+       </tr>
+       <tr>
+               <td colspan="2" height="10" class="seperator left2 right2">&nbsp;</td>
+       </tr>
+       <tr>
+               <td align="center" class="left2" width="50%">
+                       <form accept-charset="utf-8" action="{?URL?}/modules.php?module=login&amp;what=mydata" method="post" style="margin-top: 0px">
+                               <input type="submit" name="notify" class="member_reset" value="Benachrichtigung abschalten" />
+                       </form>
+               </td>
+               <td align="center" class="right2" width="50%">
+                       <form accept-charset="utf-8" action="{?URL?}/modules.php?module=login&amp;what=mydata" method="post" style="margin-top: 0px">
+                               <input type="submit" name="edit" class="member_reset" value="Profildaten &auml;ndern" />
+                       </form>
+               </td>
+       </tr>
+       <tr>
+               <td colspan="4" height="10" class="seperator left2 bottom2 right2">&nbsp;</td>
+       </tr>
+</table>
index 4c1eb55..11f5d85 100644 (file)
@@ -1,51 +1 @@
-<table border="0" cellspacing="0" cellpadding="0" width="90%"
-       class="member_update">
-       <tr>
-               <td colspan="2" height="10" class="seperator top2 left2 right2">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="2" class="left2 right2" align="center">
-               <table border="0" cellspacing="0" cellpadding="0" width="100%"
-                       class="member_update" align="center">
-                       <tr>
-                               <td width="10" class="seperator">&nbsp;</td>
-                               <td align="left">
-                               <div align="center"><strong>Vielen Dank, dass Sie uns
-                               auf dem Laufenden halten wollen!</strong></div>
-                               <br />
-                               Wenn Sie jetzt Ihr Profil aktualisieren wollen, klicken Sie einfach
-                               unten auf den Button. War unsere Benachrichtigung ein Irrtum, so
-                               k&ouml;nnen Sie mit einem Klick die Benachrichtigung abschalten. Sie
-                               werden dann f&uuml;r l&auml;ngere Zeit von unserem System keine
-                               Benachrichtigungen erhalten.<br />
-                               <br />
-                               Bitte haben Sie nochmals f&uuml;r diese Massnahme Verst&auml;ndnis.
-                               Auch wir m&ouml;chten aktuelle Daten haben, damit wir unseren
-                               {?mt_word?} reibungslos betreiben k&ouml;nnen und es kommt auch
-                               unseren Werbekunden zugute.</td>
-                               <td width="10" class="seperator">&nbsp;</td>
-                       </tr>
-               </table>
-               </td>
-       </tr>
-       <tr>
-               <td colspan="2" height="10" class="seperator left2 right2">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="center" class="left2" width="50%">
-               <form accept-charset="utf-8" action="{?URL?}/modules.php?module=login&amp;what=mydata"
-                       method="post" style="margin-top: 0px"><input type="submit"
-                       name="notify" class="member_reset"
-                       value="Benachrichtigung abschalten"></form>
-               </td>
-               <td align="center" class="right2" width="50%">
-               <form accept-charset="utf-8" action="{?URL?}/modules.php?module=login&amp;what=mydata"
-                       method="post" style="margin-top: 0px"><input type="submit"
-                       name="edit" class="member_reset" value="Profildaten &auml;ndern">
-               </form>
-               </td>
-       </tr>
-       <tr>
-               <td colspan="4" height="10" class="seperator left2 bottom2 right2">&nbsp;</td>
-       </tr>
-</table>
+<!-- @DEPRECATED //-->