Some cleanups/rewrites here and there:

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

diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 06b60684134c6fb8ff294859ca2ed226106baf4d..344cb3258906753f11307c0d574465fc987a0211 100644 (file)
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -53,50 +53,50 @@ switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                addDropTableSql('user_cats');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_cats` (
-  `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
-  `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `cat_id` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
-PRIMARY KEY  (`id`),
+`id` BIGINT(22) NOT NULL AUTO_INCREMENT,
+`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`cat_id` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
+PRIMARY KEY (`id`),
 INDEX (`userid`),
 INDEX (`cat_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
 
                addDropTableSql('user_data');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_data` (
-  `userid` BIGINT(22) NOT NULL AUTO_INCREMENT,
-  `surname` VARCHAR(255) NOT NULL DEFAULT '',
-  `family` VARCHAR(255) NOT NULL DEFAULT '',
-  `street_nr` VARCHAR(255) NOT NULL DEFAULT '',
-  `country` VARCHAR(4) NOT NULL DEFAULT '',
-  `zip` VARCHAR(6) NOT NULL DEFAULT '',
-  `city` VARCHAR(255) NOT NULL DEFAULT '',
-  `email` VARCHAR(255) NOT NULL DEFAULT '',
-  `birth_day` CHAR(2) NOT NULL DEFAULT '01',
-  `birth_month` CHAR(2) NOT NULL DEFAULT '01',
-  `birth_year` VARCHAR(4) NOT NULL DEFAULT '1970',
-  `password` VARCHAR(255) NOT NULL DEFAULT '',
-  `max_mails` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `receive_mails` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `refid` BIGINT(22) NOT NULL DEFAULT 0,
-  `status` ENUM('UNCONFIRMED','CONFIRMED','LOCKED') NOT NULL DEFAULT 'UNCONFIRMED',
-  `user_hash` VARCHAR(255) NULL DEFAULT NULL,
-  `REMOTE_ADDR` VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
-  `last_online` VARCHAR(10) NOT NULL DEFAULT 0,
-  `last_module` VARCHAR(255) NOT NULL DEFAULT '',
-  `ref_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `total_logins` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `gender` ENUM('M','F') NOT NULL DEFAULT 'M',
-  `used_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
-  `emails_sent` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `joined` VARCHAR(10) NOT NULL DEFAULT 0,
-  `last_update` VARCHAR(10) NOT NULL DEFAULT 0,
-  `last_profile_sent` VARCHAR(10) NOT NULL DEFAULT 0,
-  `notified` ENUM('Y','N') NOT NULL DEFAULT 'N',
-  `ref_payout` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
-  `last_login` VARCHAR(10) NOT NULL DEFAULT 0,
-  `login_failures` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `last_failure` TIMESTAMP NULL DEFAULT NULL,
-PRIMARY KEY  (`userid`),
+`userid` BIGINT(22) NOT NULL AUTO_INCREMENT,
+`surname` VARCHAR(255) NOT NULL DEFAULT '',
+`family` VARCHAR(255) NOT NULL DEFAULT '',
+`street_nr` VARCHAR(255) NOT NULL DEFAULT '',
+`country` VARCHAR(4) NOT NULL DEFAULT '',
+`zip` VARCHAR(6) NOT NULL DEFAULT '',
+`city` VARCHAR(255) NOT NULL DEFAULT '',
+`email` VARCHAR(255) NOT NULL DEFAULT '',
+`birth_day` CHAR(2) NOT NULL DEFAULT '01',
+`birth_month` CHAR(2) NOT NULL DEFAULT '01',
+`birth_year` VARCHAR(4) NOT NULL DEFAULT '1970',
+`password` VARCHAR(255) NOT NULL DEFAULT '',
+`max_mails` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`receive_mails` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`refid` BIGINT(22) NOT NULL DEFAULT 0,
+`status` ENUM('UNCONFIRMED','CONFIRMED','LOCKED') NOT NULL DEFAULT 'UNCONFIRMED',
+`user_hash` VARCHAR(255) NULL DEFAULT NULL,
+`REMOTE_ADDR` VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
+`last_online` VARCHAR(10) NOT NULL DEFAULT 0,
+`last_module` VARCHAR(255) NOT NULL DEFAULT '',
+`ref_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`total_logins` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`gender` ENUM('M','F') NOT NULL DEFAULT 'M',
+`used_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
+`emails_sent` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`joined` VARCHAR(10) NOT NULL DEFAULT 0,
+`last_update` VARCHAR(10) NOT NULL DEFAULT 0,
+`last_profile_sent` VARCHAR(10) NOT NULL DEFAULT 0,
+`notified` ENUM('Y','N') NOT NULL DEFAULT 'N',
+`ref_payout` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
+`last_login` VARCHAR(10) NOT NULL DEFAULT 0,
+`login_failures` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`last_failure` TIMESTAMP NULL DEFAULT NULL,
+PRIMARY KEY (`userid`),
 UNIQUE (`user_hash`),
 INDEX (`refid`),
 INDEX `status_mails` (`status`,`max_mails`)
@@ -104,42 +104,42 @@ INDEX `status_mails` (`status`,`max_mails`)
 
                addDropTableSql('user_points');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_points` (
-  `id` BIGINT(22) NOT NULL AUTO_INCREMENT,
-  `userid` BIGINT(22) NOT NULL DEFAULT 0,
-  `ref_depth` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
-  `points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
-  `locked_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
-PRIMARY KEY  (`id`),
+`id` BIGINT(22) NOT NULL AUTO_INCREMENT,
+`userid` BIGINT(22) NOT NULL DEFAULT 0,
+`ref_depth` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
+`points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
+`locked_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
+PRIMARY KEY (`id`),
 INDEX (`userid`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
 
                addDropTableSql('user_links');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_links` (
-  `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `stats_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `link_type` ENUM('NORMAL') NOT NULL DEFAULT 'NORMAL',
-PRIMARY KEY  (`id`),
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`stats_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`link_type` ENUM('NORMAL') NOT NULL DEFAULT 'NORMAL',
+PRIMARY KEY (`id`),
 INDEX (`userid`),
 INDEX (`stats_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
 
                addDropTableSql('user_stats');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_stats` (
-  `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `cat_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `payment_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `subject` VARCHAR(200) NOT NULL DEFAULT '',
-  `url` TINYTEXT NOT NULL,
-  `max_rec` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `timestamp_ordered` VARCHAR(10) NOT NULL DEFAULT '',
-  `pool_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-  `timestamp_sstart` VARCHAR(10) NOT NULL DEFAULT '',
-  `timestamp_send` VARCHAR(10) NOT NULL DEFAULT '',
-  `is_stats` ENUM('Y','N') NOT NULL DEFAULT 'N',
-PRIMARY KEY  (`id`),
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`cat_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`payment_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`subject` VARCHAR(200) NOT NULL DEFAULT '',
+`url` TINYTEXT NOT NULL,
+`max_rec` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`timestamp_ordered` VARCHAR(10) NOT NULL DEFAULT '',
+`pool_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`timestamp_sstart` VARCHAR(10) NOT NULL DEFAULT '',
+`timestamp_send` VARCHAR(10) NOT NULL DEFAULT '',
+`is_stats` ENUM('Y','N') NOT NULL DEFAULT 'N',
+PRIMARY KEY (`id`),
 INDEX (`userid`),
 INDEX (`cat_id`),
 INDEX (`payment_id`),
@@ -400,7 +400,7 @@ PRIMARY KEY (`id`)
                                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid` IS NULL");
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `ref_depth`=NULL WHERE `ref_depth`=0");
                                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid` IS NULL");
-                               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `userid` IS NULL OR  `refid` IS NULL OR `level` IS NULL");
+                               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `userid` IS NULL OR `refid` IS NULL OR `level` IS NULL");
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `cat_id`=NULL WHERE `cat_id`=0");
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `payment_id`=NULL WHERE `payment_id`=0");
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `pool_id`=NULL WHERE `pool_id`=0");