X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-html_mail.php;h=88481d29682d95f2182454ecae2861c873f8a78b;hb=378729b7c01f1cf81a83de69deaa0510b3302af4;hp=3b36479df5a371c7be36453d2fe77024788c97dd;hpb=8268379f7f0f38f5cd605714ecd5cbfacff0e282;p=mailer.git

diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 3b36479df5..88481d2968 100644
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -1,24 +1,23 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 03/22/2004 *
- * ================                             Last change: 05/02/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 03/22/2004 *
+ * ===================                          Last change: 05/02/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-html_mail.php                                *
  * -------------------------------------------------------------------- *
  * Short description : HTML mails with default mail() routine           *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : HTML-Mails mit Standart mail()-Routine           *
+ * Kurzbeschreibung  : HTML-Mails mit Standard mail()-Routine           *
  * -------------------------------------------------------------------- *
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://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 *
@@ -39,100 +38,52 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Version number
-setThisExtensionVersion('0.1.6');
+setThisExtensionVersion('0.1.8');
 
-// Version history array (add more with , '0.1.0' and so on)
-setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.51', '0.0.52', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6'));
+// Version history array (add more with , '0.0.1' and so on)
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.51', '0.0.52', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8'));
 
 switch (getExtensionMode()) {
-	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+	case 'setup': // Do stuff when installation is running
 		// SQL commands to run
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'");
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_bonus` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'");
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_pool` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'");
-		addMemberMenuSql('main','html_mail','HTML-Empfang','N','Y',3);
+		addExtensionAddTableColumnSql('user_data', 'html', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+		addExtensionAddTableColumnSql('bonus', 'html_msg', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
+		addExtensionAddTableColumnSql('pool', 'html_msg', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
+		addMemberMenuSql('account', 'html_mail', 'HTML-Empfang', 3);
+
+		// Register filter here
+		registerFilter(__FILE__, __LINE__, 'exclude_users', 'HTML_INCLUDE_USERS', FALSE, TRUE, isExtensionDryRun());
 		break;
 
 	case 'remove': // Do stuff when removing extension
 		// SQL commands to run
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` DROP html");
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_bonus` DROP html_msg");
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_pool` DROP html_msg");
-		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='html_mail'");
+		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='html_mail' LIMIT 1");
+
+		// Remove filter(s)
+		unregisterFilter(__FILE__, __LINE__, 'pre_mail_order', 'MAIL_ORDER_GENERIC_CHECK_URL', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'exclude_users', 'HTML_INCLUDE_USERS', TRUE, isExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
 		// SQL commands to run
-		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='html_mail' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='html_mail' LIMIT 1");
 		break;
 
 	case 'deactivate': // Do stuff when admin deactivates this extension
 		// SQL commands to run
-		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='html_mail' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='html_mail' LIMIT 1");
 		break;
 
 	case 'update': // Update an extension
-		switch (getCurrentExtensionVersion()) {
-			case '0.0.6': // SQL queries for v0.0.6
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Der erstellte HTML-Code wird noch kompiliert (eigene HTML-Codes umgewandelt).");
-				break;
-
-			case '0.0.8': // SQL queries for v0.0.8
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehlende Abfrage im Mitlieder-Modul, on Erweiterung auch aktiviert ist.");
-				break;
-
-			case '0.0.9': // SQL queries for v0.0.9
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
-				break;
-
-			case '0.1.0': // SQL queries for v0.2.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Men&uuml;punkte im Gast-/Mitgliedsbereich k&ouml;nnen nicht mehr aufgerufen werden, wenn die Erweiterung deaktiviert ist.");
-				break;
-
-			case '0.1.1': // SQL queries for v0.1.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Seit <strong>Patch 340</strong> &uuml;berfl&uuml;ssige HTML-Tags entfernt.");
-				break;
-
-			case '0.1.2': // SQL queries for v0.1.2
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.");
-				break;
-
-			case '0.1.3': // SQL queries for v0.1.3
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Sicherheitsupdate: SQL-Anweisungen gesch&uuml;tzt.");
-				break;
-
-			case '0.1.4': // SQL queries for v0.1.4
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
-				break;
-
-			case '0.1.5': // SQL queries for v0.1.5
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
-				break;
-
-			case '0.1.6':
-				// Dependency is needed for ext-registration!! (want to alter a non existent Table)
-				addExtensionUpdateDependency('bonus');
-				setExtensionUpdateNotes("Abh&auml;nigkeit von der Erweiterung <strong>bonus</strong> hinzugef&uuml;gt.");
-				break;
-		}
 		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.
+	case 'test': // For testing purposes
 		break;
 
 	case 'init': // Do stuff when extension is initialized
@@ -157,8 +108,8 @@ switch (getExtensionMode()) {
 		//
 		$GLOBALS['url_ends'] = array(
 			' ',
-			"\n",
-			"\r",
+			PHP_EOL,
+			chr(13),
 			')',
 		);
 
@@ -166,15 +117,15 @@ switch (getExtensionMode()) {
 		$GLOBALS['valid_email_chars'] = array(
 			'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s',
 			't','u','v','w','x','y','z','a','B','C','D','E','F','G','H','I','J','K','L',
-			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_','0','1',
-			'2','3','4','5','6','7','8','9'
+			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_',0,1,
+			2,3,4,5,6,7,8,9
 		);
 		break;
 
 	default: // Unknown extension mode
-		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode()));
+		reportBug(__FILE__, __LINE__, sprintf('Unknown extension mode %s in extension %s detected.', getExtensionMode(), getCurrentExtensionName()));
 		break;
-} // END - switc
+} // END - switch
 
 // [EOF]
 ?>