X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-holiday.php;h=309b4ccabcde2bb9fbcedaf0aa515a8e7b0a8365;hp=1d6a3187abd2fa43338a36a191ddaaf200de3330;hb=c5a4b89497cf1430b387b43e0c7808ef6dac0acd;hpb=dfaa8c1675da4071ea451406a6f6fedd4c568416

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 1d6a3187ab..309b4ccabc 100644
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -48,14 +48,14 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.
 
 switch ($EXT_LOAD_MODE)
 {
-case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
+case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
 	// Create database
 	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_holidays";
 	$SQLs[] = "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',
+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 LONGBLOB NOT NULL,
 KEY (userid),
 PRIMARY KEY(id)
@@ -83,7 +83,7 @@ case "remove": // Do stuff when removing extension
 	$SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='holiday' LIMIT 1";
 	$SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='holiday' LIMIT 4";
 	$SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_max_receive WHERE value='0' LIMIT 1";
-	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES('0','Urlaub')";
+	$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_max_receive (value, comment) VALUES ('0','Urlaub')";
 	break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -93,7 +93,7 @@ case "activate": // Do stuff when admin activates this extension
 
 case "deactivate": // Do stuff when admin deactivates this extension
 	// SQL commands to run
-	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='holiday' LIMIT 1";
+	$SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='N', locked='Y' WHERE what='holiday' LIMIT 1";
 	break;
 
 case "update": // Update an extension
@@ -157,7 +157,7 @@ case "update": // Update an extension
 	case "0.1.3": // SQL queries for v0.1.3
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD holiday_active ENUM('Y','N') NOT NULL DEFAULT 'N'";
 		$SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_max_receive WHERE value='0' LIMIT 1";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_lock BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(60*60*24*2)."'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD holiday_lock BIGINT(20) UNSIGNED NOT NULL DEFAULT '".($_CONFIG['one_day']*2)."'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "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!";
@@ -178,7 +178,7 @@ case "update": // Update an extension
 		break;
 
 	case "0.1.6": // SQL queries for v0.1.6
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD holiday_activated BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
+		$SQLs[] = "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!)
 		$UPDATE_NOTES = "Fehlende Tabellenspalte hinzugef&uuml;gt.";
@@ -190,9 +190,9 @@ case "update": // Update an extension
 		break;
 
 	case "0.1.8": // SQL queries for v0.1.8
-		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', NULL, 'list_holiday')";
-		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', NULL, 'del_holiday')";
-		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('config', NULL, 'config_holiday')";
+		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', '', 'list_holiday')";
+		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu_las (la_id, la_action, la_what) VALUES ('member', '', 'del_holiday')";
+		$SQLs[] = "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
 		$EXT_UPDATE_DEPENDS = "sql_patches";
@@ -226,8 +226,5 @@ default: // Do stuff when extension is loaded
 	break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "holiday";
-
 //
 ?>