X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-birthday.php;h=7ea5372bc388adde6215835c802449104a112379;hb=08bcd047b40c7bbb2093fa7ee82f8681f19d960b;hp=418d0b33cfcbf9d5b7c9fb38073dd40796586b50;hpb=f75775e78818717e3e52d15b166ba5d25ec97f68;p=mailer.git

diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index 418d0b33cf..7ea5372bc3 100644
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -51,7 +51,7 @@ 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."_user_data ADD birthday_sent varchar(10) NOT NULL default '0'";
+	$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD birthday_sent VARCHAR(10) NOT NULL DEFAULT '0'";
 	break;
 
 case "remove": // Do stuff when removing extension
@@ -81,13 +81,13 @@ case "update": // Update an extension
 		break;
 
 	case "0.2": // SQL queries for v0.2
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_points bigint(20) not null default '0'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_points BIGINT(20) NOT NULL DEFAULT '0'";
 		$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_birthday";
 		$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_user_birthday (
-id bigint(20) not null auto_increment,
-userid bigint(20) not null default '0',
-points bigint(20) not null default '0',
-chk_value varchar(255) not null default '',
+id BIGINT(20) NOT NULL AUTO_INCREMENT,
+userid BIGINT(20) NOT NULL DEFAULT '0',
+points BIGINT(20) NOT NULL DEFAULT '0',
+chk_value VARCHAR(255) NOT NULL DEFAULT '',
 KEY(userid),
 PRIMARY KEY(id)
 ) Type=MyISAM";
@@ -163,8 +163,8 @@ PRIMARY KEY(id)
 		break;
 
 	case "0.3.6": // SQL queries for v0.3.6
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_mode enum('DIRECT', 'REF') not null default 'DIRECT'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_active enum('Y', 'N') not null default 'N'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_mode ENUM('DIRECT', 'REF') NOT NULL DEFAULT 'DIRECT'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD birthday_active ENUM('Y', 'N') NOT NULL DEFAULT 'N'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Vergütungsmodus des Geburtstagsbonus einstellbar.";
@@ -186,18 +186,16 @@ default: // Do stuff when extension is loaded
 	$dummy = LOAD_CONFIG();
 
 	// Copy config to main array
-	$_CONFIG['birthday_points'] = $dummy['birthday_points'];
-	$_CONFIG['birthday_mode']   = $dummy['birthday_mode'];
-	$_CONFIG['birthday_active'] = $dummy['birthday_active'];
+	$_CONFIG = merge_array($_CONFIG, $dummy);
 
 	// Save some RAM...
 	unset($dummy);
 
-	if ((defined('__DAILY_RESET')) && ($_CONFIG['birthday_points'] > 0))
+	if ((isBooleanConstantAndTrue('__DAILY_RESET')) && ($_CONFIG['birthday_points'] > 0))
 	{
 		// Daily reset was run and we shall pay points so we start checking for members who
 		// has a birthday for today
-		$INC_POOL[] = PATH."inc/mails/birthday_mails.php";
+		$INC_POOL[] = sprintf("%sinc/mails/birthday_mails.php", PATH);
 	}
 	break;
 }
@@ -206,7 +204,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "birthday";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'N';
+$EXT_ALWAYS_ACTIVE = "N";
 
 //
 ?>