More fixes for points booking and surfbar

[mailer.git] / inc / extensions / ext-birthday.php

diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index 9eedddefcd58deffd1c0624c4c00bce6ff19b2bc..7ea5372bc388adde6215835c802449104a112379 100644 (file)
--- 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,16 +186,16 @@ default: // Do stuff when extension is loaded
        $dummy = LOAD_CONFIG();
 
        // Copy config to main array
-       $_CONFIG = array_merge($_CONFIG, $dummy);
+       $_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;
 }