X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-holiday.php;h=310cf7c6022f85cbf91748bb7a392df4938505a5;hb=a524135c24dd0a8fa359c9a92399467d50fd69e0;hp=e302d77188c62ffe32faba263e4eaed89a66ba02;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index e302d77188..310cf7c602 100644
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/17/2004 *
- * ================                             Last change: 01/13/2006 *
+ * Mailer v0.2.1-FINAL                                Start: 06/17/2004 *
+ * ===================                          Last change: 01/13/2006 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-holiday.php                                  *
@@ -14,11 +14,10 @@
  * $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 - 2016 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,202 +38,84 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Version number
-setThisExtensionVersion('0.2.1');
+setThisExtensionVersion('0.2.3');
 
-// 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.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', '0.1.9', '0.2.0', '0.2.1'));
+// 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.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', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3'));
 
 switch (getExtensionMode()) {
-	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+	case 'setup': // Do stuff when installation is running
 		// Create database
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_holidays`");
-		addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_holidays` (
-id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-holiday_start VARCHAR(10) NOT NULL DEFAULT 0,
-holiday_end VARCHAR(10) NOT NULL DEFAULT 0,
-comments LONGTEXT NOT NULL,
-KEY (userid),
-PRIMARY KEY (id)
-) TYPE={?_TABLE_TYPE?}");
+		addDropTableSql('user_holidays');
+		addCreateTableSql('user_holidays', "
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`holiday_start` VARCHAR(10) NOT NULL DEFAULT 0,
+`holiday_end` VARCHAR(10) NOT NULL DEFAULT 0,
+`comments` LONGTEXT NOT NULL,
+PRIMARY KEY (`id`),
+INDEX (`userid`)",
+			'User holiday data');
 
 		// Add default values to config
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'");
+		addConfigAddSql('holiday_max', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 30');
 
 		// Add member menu
-		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','holiday','Urlaubsschaltung','4','Y','Y')");
+		addMemberMenuSql('main', 'holiday', 'Urlaubsschaltung', 4);
 
 		// Add admin menus
-		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier k&ouml;nnen Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')");
-		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('holiday','list_holiday','Auflisten','1','Alle Urlaubsschaltungen auflisten.')");
-		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('holiday','del_holiday','Urlaub beenden','2','Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur &quot;Verstoss gegen unsere AGBs&quot; ein!')");
-		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('holiday','config_holiday','Einstellungen','3','Maximale Tage f&uuml;r Urlaub usw. einstellen.')");
+		addAdminMenuSql('holiday', NULL, 'Urlaubsmanagement', 'Hier k&ouml;nnen Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.', 4);
+		addAdminMenuSql('holiday', 'list_holiday', 'Auflisten', 'Alle Urlaubsschaltungen auflisten.', 1);
+		addAdminMenuSql('holiday', 'del_holiday', 'Urlaub beenden', 'Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur &quot;Verstoss gegen unsere AGBs&quot; ein!', 2);
+		addAdminMenuSql('holiday', 'config_holiday', 'Einstellungen', 'Maximale Tage f&uuml;r Urlaub usw. einstellen.', 3);
 
 		// Remove 0 max mails per day
-		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value='0' LIMIT 1");
+		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value=0 LIMIT 1");
 		break;
 
 	case 'remove': // Do stuff when removing extension
 		// SQL commands to run
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_holidays`");
+		addDropTableSql('user_holidays');
 		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='holiday' LIMIT 1");
 		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='holiday' LIMIT 4");
-		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value='0' LIMIT 1");
-		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (value, comment) VALUES ('0','Urlaub')");
+		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value`=0 LIMIT 1");
+		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (0,'Urlaub')");
+
+		// Unregister filter
+		unregisterFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'HOLIDAY_USER_EXCLUSION_SQL', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'pre_mail_recipient_check', 'CHECK_USER_HOLIDAY', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'pre_category_mail_order_check', 'PRE_USERID_HOLIDAY_CHECK', 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`='holiday' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='holiday' 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`='holiday' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='holiday' LIMIT 1");
 		break;
 
 	case 'update': // Update an extension
-		switch (getCurrentExtensionVersion())
-		{
-			case '0.0.2': // SQL queries for v0.0.2
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehlende Abfrage im Mitlieder-Modul, on Erweiterung auch aktiviert ist.");
-				break;
-
-			case '0.0.3': // SQL queries for v0.0.3
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
-				break;
-
-			case '0.0.4': // SQL queries for v0.0.4
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Problem mit Speicherung der Einstellungen beseitigt.");
-				break;
-
-			case '0.0.5': // SQL queries for v0.0.5
-				// 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.0.6': // SQL queries for v0.0.6
-				// 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.0.7': // SQL queries for v0.0.7
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("IP-Nummer und Browserbezeichnung wird in Admin-Mails eingesetzt.");
-				break;
-
-			case '0.0.8': // SQL queries for v0.0.8
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Link zum Mitgliedsprofil in Funktion <u>generateUserProfileLink()</u> ausgelagert.");
-				break;
-
-			case '0.0.9': // SQL queries for v0.0.9
-				// 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.0': // SQL queries for v0.2.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Sicherheitsupdate: SQL-Anweisungen gesch&uuml;tzt.");
-				break;
-
-			case '0.1.1': // SQL queries for v0.1.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
-				break;
-
-			case '0.1.2': // SQL queries for v0.1.2
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Abspeichern der Urlaubsanfrage korregiert.");
-				break;
-
-			case '0.1.3': // SQL queries for v0.1.3
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD holiday_active ENUM('Y','N') NOT NULL DEFAULT 'N'");
-				addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value='0' LIMIT 1");
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD holiday_lock BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('ONE_DAY')*2)."'");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Die Mitglieder-Accounts werden nicht mehr gesperrt, sondern nur auf <strong>Urlaub</strong> geschaltet. Lassen Sie sich nicht davon verwirren, dass sie &quot;freigegeben&quot; sind!");
-				break;
-
-			case '0.1.4': // SQL queries for v0.1.4
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Urlaubsschaltung wird erst Abends um 00:00 Uhr aktiv und nicht durch die Beantragung. Dies kann nun auch auf direkte Umstellung eingestellt werden.");
-				break;
-
-			case '0.1.5': // SQL queries for v0.1.5
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Sicherheitsupdate f&uuml;r die Include-Befehle.");
-				break;
-
-			case '0.1.6': // SQL queries for v0.1.6
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD holiday_activated BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehlende Tabellenspalte hinzugef&uuml;gt.");
-				break;
-
-			case '0.1.7': // SQL queries for v0.1.7
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.");
-				break;
-
-			case '0.1.8': // SQL queries for v0.1.8
-				addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'list_holiday')");
-				addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'del_holiday')");
-				addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (la_id, la_action, la_what) VALUES ('config', '', 'config_holiday')");
-
-				// Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin
-				addExtensionUpdateDependency('sql_patches');
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Erweiterung in's neue Men&uuml;system integriert.");
-				break;
-
-			case '0.1.9': // SQL queries for v0.1.9
-				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='account', `sort`='2', `title`='In Urlaub' WHERE `what`='holiday' LIMIT 1");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Mitgliedsmen&uuml; komplett umgebaut.");
-				break;
-
-			case '0.2.0': // SQL queries for v0.2.0
-				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET title = 'Urlaubsmanagement' WHERE action = 'holiday' AND (`what`='' OR `what` IS NULL) LIMIT 1");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Mitgliedsmen&uuml; komplett umgebaut.");
-				break;
-
-			case '0.2.1': // SQL queries for v0.2.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
-				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
 		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 - switch
 
 // [EOF]
 ?>