X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fextensions%2Fext-holiday.php;h=57cf3e78031cc55574d9e0c9ea887f5822e294e7;hb=0dd76819236495cb7cfe97d8152700b895261eea;hp=2491236140e5a5410bffccf56d68b4b53eacb7aa;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git
diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 2491236140..57cf3e7803 100644
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -16,7 +16,7 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * 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 *
@@ -41,13 +41,13 @@ if (!defined('__SECURITY')) {
} // END - if
// Version number
-setThisExtensionVersion('0.2.1');
+setThisExtensionVersion('0.2.3');
// 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'));
+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
+ case 'setup': // Do stuff when installation is running
// Create database
addDropTableSql('user_holidays');
addCreateTableSql('user_holidays', "
@@ -82,141 +82,25 @@ INDEX (`userid`)",
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("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üpunkte im Gast-/Mitgliedsbereich kö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 Patch 340 überflü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 generateUserProfileLink() ausgelagert.");
- break;
-
- case '0.0.9': // SQL queries for v0.0.9
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Wörter {?mt_word?}, {?mt_word2?} und {?mt_word3?} 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ü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");
- addConfigAddSql('holiday_lock', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT ' . (getOneDay() * 2));
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Die Mitglieder-Accounts werden nicht mehr gesperrt, sondern nur auf Urlaub geschaltet. Lassen Sie sich nicht davon verwirren, dass sie "freigegeben" sind!");
- break;
-
- case '0.1.4': // SQL queries for v0.1.4
- addConfigAddSql('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
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Sicherheitsupdate fü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ü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 empty() 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 ext-sql_patches (or you have to execute these both SQL statements by phpMyAdmin
- addExtensionDependency('sql_patches');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Erweiterung in's neue Menü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ü 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ü 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;
- } // END - switch
break;
case 'modify': // When the extension got modified
@@ -229,7 +113,7 @@ INDEX (`userid`)",
break;
default: // Unknown extension mode
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
+ reportBug(__FILE__, __LINE__, sprintf('Unknown extension mode %s in extension %s detected.', getExtensionMode(), getCurrentExtensionName()));
break;
} // END - switch