X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-autopurge.php;h=84207b9bb3ba734350804b997d262f7fbe909577;hb=08bcd047b40c7bbb2093fa7ee82f8681f19d960b;hp=136d94b2f9377b000dba2d1bb4098359c25a9cff;hpb=3299d3eba008bfd2450d0f19d072126f98c78e1e;p=mailer.git

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 136d94b2f9..84207b9bb3 100644
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -51,19 +51,19 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
 	// SQL commands to run
-	$SQLs[] = "alter table "._MYSQL_PREFIX."_pool modify data_type enum('TEMP','SEND','NEW','ADMIN','ACTIVE','DELETED') not null default 'TEMP'";
+	$SQLs[] = "alter table "._MYSQL_PREFIX."_pool modify data_type ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE','DELETED') NOT NULL DEFAULT 'TEMP'";
 	if (EXT_IS_ACTIVE("bonus"))
 	{
-		$SQLs[] = "alter table "._MYSQL_PREFIX."_bonus modify data_type enum('NEW','QUEUE','SEND','DELETED') not null default 'NEW'";
+		$SQLs[] = "alter table "._MYSQL_PREFIX."_bonus modify data_type ENUM('NEW','QUEUE','SEND','DELETED') NOT NULL DEFAULT 'NEW'";
 	}
 	break;
 
 case "remove": // Do stuff when removing extension
 	// SQL commands to run
-	$SQLs[] = "alter table "._MYSQL_PREFIX."_pool modify data_type enum('TEMP','SEND','NEW','ADMIN','ACTIVE') not null default 'TEMP'";
+	$SQLs[] = "alter table "._MYSQL_PREFIX."_pool modify data_type ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP'";
 	if (EXT_IS_ACTIVE("bonus"))
 	{
-		$SQLs[] = "alter table "._MYSQL_PREFIX."_bonus modify data_type enum('NEW','QUEUE','SEND') not null default 'NEW'";
+		$SQLs[] = "alter table "._MYSQL_PREFIX."_bonus modify data_type ENUM('NEW','QUEUE','SEND') NOT NULL DEFAULT 'NEW'";
 	}
 	$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config DROP autopurge_inactive";
 	$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config DROP autopurge_unconfirmed";
@@ -89,14 +89,14 @@ case "update": // Update an extension
 	switch ($EXT_VER)
 	{
 	case "0.1": // SQL queries for v0.1
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_inactive enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_unconfirmed enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_since bigint(20) not null default '2592000'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_time bigint(20) not null default '25200'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_unconfirmed_time bigint(20) not null default '432000'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_inactive ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_unconfirmed ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_since BIGINT(20) NOT NULL DEFAULT '2592000'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_inactive_time BIGINT(20) NOT NULL DEFAULT '25200'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_unconfirmed_time BIGINT(20) NOT NULL DEFAULT '432000'";
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_autopurge', 'Auto-Löschung', 'Automatisch inaktive oder nicht bestätigte Accounts löschen.', '12')";
 		$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('user', 'list_autopurge', 'Inaktive finden', 'Lassen Sie sich vor dem täglichen Reset anzeigen, welche Mitglieder als inaktiv erkannt werden und welche gelöscht werden.', '10')";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD ap_notified bigint(20) not null default '0'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD ap_notified BIGINT(20) NOT NULL DEFAULT '0'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Automatisches L&ouml:schen von inaktiven bzw. nicht bestätigten Accounts hinzugefügt.";
@@ -134,17 +134,17 @@ case "update": // Update an extension
 		break;
 
 	case "0.1.9": // SQL queries for v0.1.9
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_tasks enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_time bigint(20) not null default '".(60*60*24*7)."'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD autopurge_tasks ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_time BIGINT(20) NOT NULL DEFAULT '".(60*60*24*7)."'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_in_notify enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_un_notify enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_notify enum('Y', 'N') not null default 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_in_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_un_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_tasks_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<br /><br /><U>Bitte aktualisieren Sie auch die Admin-Templates!</U>";
@@ -211,9 +211,9 @@ case "update": // Update an extension
 		break;
 
 	case "0.3.3": // SQL queries for v0.3.3
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_del_mails enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_dm_notify enum('Y', 'N') not null default 'Y'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_dm_timeout bigint(20) not null default '86400'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_del_mails ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_dm_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD ap_dm_timeout BIGINT(20) NOT NULL DEFAULT '86400'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Von bereits gel&ouml;schten Mitgliedern die Mails l&ouml;schen integriert.";
@@ -258,14 +258,14 @@ case "update": // Update an extension
 
 default: // Do stuff when extension is loaded
 	$dummy = LOAD_CONFIG();
-	$_CONFIG = array_merge($_CONFIG, $dummy);
+	$_CONFIG = merge_array($_CONFIG, $dummy);
 	unset($dummy);
 
 	// Do we have a daily-reset-run?
-	if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
+	if (isBooleanConstantAndTrue('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
 	{
 		// Yes, we have. So let's auto-purge some campaigns, inactive users and unconfirmed accounts
-		$INC_POOL[] = PATH."inc/autopurge.php";
+		$INC_POOL[] = sprintf("%sinc/autopurge.php", PATH);
 	}
 	break;
 }
@@ -273,7 +273,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "autopurge";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'Y';
+$EXT_ALWAYS_ACTIVE = "Y";
 
 //
 ?>