From 26f2da755103cc6ef9134c7275c94d738beb83c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 5 Jul 2010 09:08:25 +0000 Subject: [PATCH] More fixes for typos in SQL queries --- inc/extensions/ext-beg.php | 2 +- inc/extensions/ext-bonus.php | 13 +++++++++++-- inc/extensions/ext-rallye.php | 4 ++-- inc/libs/register_functions.php | 11 +++++++---- inc/mails/beg_mails.php | 5 ++--- inc/mails/bonus_mails.php | 5 ++--- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index bff1c14f4a..e8a0107f50 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -249,7 +249,7 @@ PRIMARY KEY (id) break; case '0.2.6': // SQL queries for v0.2.6 - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_beg_ips` ADD sid VARCHAR(255) NOT NULL DEFAULT ''"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_beg_ips` ADD `sid` VARCHAR(255) NOT NULL DEFAULT ''"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `beg_pay_mode` ENUM('IMG','JS','BOTH','NONE') DEFAULT 'NONE' NOT NULL ;"); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index b579393960..cb0bd0fab9 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -43,10 +43,10 @@ if (!defined('__SECURITY')) { } // END - if // Version of this extension -setThisExtensionVersion('0.9.2'); +setThisExtensionVersion('0.9.3'); // Version history array (add more with , '0.1.0' and so on) -setExtensionVersionHistory(array('0.0', '0.1.6', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2')); +setExtensionVersionHistory(array('0.0', '0.1.6', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) @@ -568,6 +568,15 @@ WHERE `last_online` < ".$mark." ORDER BY `userid` ASC"); // Update notes setExtensionUpdateNotes("Umbenannt nach neuer Konvention (bitte Einstellungen kontrollieren)."); break; + + case '0.9.3': // SQL queries for v0.9.3 + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `bonus_ralley_enable_notify` `bonus_rallye_enable_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `bonus_ralley_disable_notify` `bonus_rallye_disable_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` DROP `bonus_ralley_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); + + // Update notes + setExtensionUpdateNotes("Typos gefixt."); + break; } // END - switch break; diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 44f1fb1e77..f03bf03c01 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -218,8 +218,8 @@ PRIMARY KEY (id) break; case '0.2.0': // SQL queries for v0.2.0 - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD min_users BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD min_prices BIGINT(20) UNSIGNED NOT NULL DEFAULT 3"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD `min_users` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD `min_prices` BIGINT(20) UNSIGNED NOT NULL DEFAULT 3"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template templates/de/emails/member/member_rallye_notify.tpl folgende zwei Zeilen ein:
diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 29a476ac23..13be207a73 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -308,7 +308,7 @@ function doRegistration () { if (isExtensionInstalledAndNewer('beg', '0.2.8')) { // Okay, shall I disable now? if (getConfig('beg_new_member_notify') != 'Y') { - $GLOBALS['register_sql_columns'] .= ', `beg_rallye_notify`, `beg_rallye_enable_notify`'; + $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`'; $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()'; } // END - if } // END - if @@ -317,7 +317,7 @@ function doRegistration () { if (isExtensionInstalledAndNewer('bonus', '0.9.2')) { // Okay, shall I disable now? if (getConfig('bonus_new_member_notify') != 'Y') { - $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_notify`, `bonus_rallye_enable_notify`'; + $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`'; $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()'; } // END - if } // END - if @@ -333,8 +333,11 @@ function doRegistration () { // Create user's account... // ////////////////////////////// // - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$GLOBALS['register_sql_columns'].") -VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$GLOBALS['register_sql_data'].")", + SQL_QUERY_ESC("INSERT INTO + `{?_MYSQL_PREFIX?}_user_data` +(`gender`, `surname`, `family`, `street_nr`,%s, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `password`, `max_mails`, `receive_mails`, `refid`, `status`, `user_hash`, `REMOTE_ADDR`, `joined`, `last_update`".$GLOBALS['register_sql_columns'].") + VALUES +('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$GLOBALS['register_sql_data'].")", array( $countryRow, substr(postRequestParameter('gender'), 0, 1), diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php index b4ea70bfd0..936bbc8b44 100644 --- a/inc/mails/beg_mails.php +++ b/inc/mails/beg_mails.php @@ -52,12 +52,12 @@ $mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear()); $sql = ''; $mode = ''; // Shall I sent activation or deactivation mail? -$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_notify` "; +$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` "; switch (getConfig('beg_rallye')) { case 'Y': // Begging rallye is activated if (getConfig('beg_rallye_enable_notify') == 'Y') { // Okay, let's check for member accounts - $sql .= '= 0 OR (`beg_rallye_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)'; + $sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)'; $mode = 'enable'; } else { // Do not notify! @@ -111,7 +111,6 @@ if (!empty($sql)) { SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `beg_rallye_notify`=UNIX_TIMESTAMP(), `beg_rallye_%s_notify`=UNIX_TIMESTAMP() WHERE `userid`=%s diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php index c236c76b44..5f486b5d2a 100644 --- a/inc/mails/bonus_mails.php +++ b/inc/mails/bonus_mails.php @@ -52,12 +52,12 @@ $mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear()); $sql = ''; $mode = ''; // Shall I sent activation or deactivation mail? -$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_notify` "; +$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` "; switch (getConfig('bonus_active')) { case 'Y': // Active rallye is activated if (getConfig('bonus_enable_notify') == 'Y') { // Okay, let's check for member accounts - $sql .= '= 0 OR (`bonus_rallye_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)'; + $sql .= '= 0 OR (`bonus_rallye_enable_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)'; $mode = 'enable'; } else { // Do not notify! @@ -100,7 +100,6 @@ if (!empty($sql)) { SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `bonus_rallye_notify`=UNIX_TIMESTAMP(), `bonus_rallye_%s_notify`=UNIX_TIMESTAMP() WHERE `userid`=%s -- 2.39.2