X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=6f3b40a646667f098715ebdcc8af44f51578d1fd;hp=46065fd5bca3db8e9c840fe011f59af3a6b6fc03;hb=30ca796470b999b169640dcac82abf5dc8693334;hpb=307a4e11763f0914e73dc756b219356e1c29ab25

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 46065fd5bc..6f3b40a646 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -55,34 +55,34 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_rallye_prices";
 	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_rallye_users";
 	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_rallye_data (
-id bigint(20) not null auto_increment,
-admin_id bigint(20) not null default '0',
-title varchar(255) not null default '',
-descr longblob not null,
-template varchar(255) not null default '',
-start_time varchar(10) not null default '0',
-end_time varchar(10) not null default '0',
-auto_add_new_user enum('Y', 'N') not null default 'Y',
-is_active enum('Y', 'N') not null default 'N',
-send_notify enum('Y', 'N') not null default 'Y',
-notified enum('Y', 'N') not null default 'N',
+id BIGINT(20) NOT NULL AUTO_INCREMENT,
+admin_id BIGINT(20) NOT NULL DEFAULT '0',
+title VARCHAR(255) NOT NULL DEFAULT '',
+descr LONGBLOB NOT NULL,
+template VARCHAR(255) NOT NULL DEFAULT '',
+start_time VARCHAR(10) NOT NULL DEFAULT '0',
+end_time VARCHAR(10) NOT NULL DEFAULT '0',
+auto_add_new_user ENUM('Y', 'N') NOT NULL DEFAULT 'Y',
+is_active ENUM('Y', 'N') NOT NULL DEFAULT 'N',
+send_notify ENUM('Y', 'N') NOT NULL DEFAULT 'Y',
+notified ENUM('Y', 'N') NOT NULL DEFAULT 'N',
 KEY (admin_id),
 PRIMARY KEY (id)
 ) TYPE=MyISAM";
 	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_rallye_prices (
-id bigint(20) not null auto_increment,
-rallye_id bigint(20) not null default '0',
-price_level bigint(20) not null default '0',
-points bigint(20) not null default '0',
-info longblob not null,
+id BIGINT(20) NOT NULL AUTO_INCREMENT,
+rallye_id BIGINT(20) NOT NULL DEFAULT '0',
+price_level BIGINT(20) NOT NULL DEFAULT '0',
+points BIGINT(20) NOT NULL DEFAULT '0',
+info LONGBLOB NOT NULL,
 KEY (rallye_id),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
 	$SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_rallye_users (
-id bigint(20) not null auto_increment,
-rallye_id bigint(20) not null default '0',
-userid bigint(20) not null default '0',
-refs bigint(20) not null default '0',
+id BIGINT(20) NOT NULL AUTO_INCREMENT,
+rallye_id BIGINT(20) NOT NULL DEFAULT '0',
+userid BIGINT(20) NOT NULL DEFAULT '0',
+refs BIGINT(20) NOT NULL DEFAULT '0',
 KEY (rallye_id),
 KEY (userid),
 PRIMARY KEY(id)
@@ -124,14 +124,14 @@ case "update": // Update an extension
 	switch ($EXT_VER)
 	{
 	case "0.0.1": // SQL queries for v0.0.1
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD expired enum('Y', 'N') not null default 'N'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD expired ENUM('Y', 'N') NOT NULL DEFAULT 'N'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Ablaufen der Rallyes intergriert.";
 		break;
 
 	case "0.0.2": // SQL queries for v0.0.2
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_users ADD curr_points double(23,3) not null default '0.000'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_users ADD curr_points DOUBLE(23,3) NOT NULL DEFAULT '0.000'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Aktueller {!POINTS!}-Stand wird beachtet.";
@@ -158,7 +158,7 @@ case "update": // Update an extension
 		break;
 
 	case "0.1.0": // SQL queries for v0.2.1
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_users CHANGE curr_points curr_points double(23,5) not null default '0.00000'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_users CHANGE curr_points curr_points DOUBLE(23,5) NOT NULL DEFAULT '0.00000'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "5 Nachkommastellen implementiert.";
@@ -210,8 +210,8 @@ case "update": // Update an extension
 		break;
 
 	case "0.2.0": // SQL queries for v0.2.0
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD min_users bigint(20) not null default '0'";
-		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD min_prices bigint(20) not null default '3'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD min_users BIGINT(20) NOT NULL DEFAULT '0'";
+		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_rallye_data ADD min_prices BIGINT(20) NOT NULL DEFAULT '3'";
 
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <STRONG>templates/de/emails/member/member_rallye_notifty.tpl</STRONG> folgende zwei Zeilen ein:<br />
@@ -310,23 +310,21 @@ default: // Do stuff when extension is loaded
 
 		// Add more data on higher versions
 		$ADD1 = ""; $ADD2 = ""; $OR = "";
-		if (GET_EXT_VERSION("rallye") >= "0.2.0")
-		{
+		if (GET_EXT_VERSION("rallye") >= "0.2.0") {
 			$ADD1 = ", min_users, min_prices";
 			$ADD2 = ", d.min_users, d.min_prices";
 			$OR   = " OR (d.min_users <= ".$TOTAL." AND d.min_users > 0)";
-		}
+		} // END  - if
 
 		// Check for new started but not notified rallyes
 		$result = SQL_QUERY("SELECT SQL_SMALL_RESULT id, title, start_time, end_time, send_notify".$ADD1."
 FROM "._MYSQL_PREFIX."_rallye_data
-WHERE is_active='Y' AND notified='N' AND expired='N' AND start_time <= ".time()." AND end_time > ".time()."
+WHERE is_active='Y' AND notified='N' AND expired='N' AND start_time <= UNIX_TIMESTAMP() AND end_time > UNIX_TIMESTAMP()
 LIMIT 1", __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+		if (SQL_NUMROWS($result) == 1) {
 			// Start rallye
 			RALLYE_AUTOSTART_RALLYES($result);
-		}
+		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result);
@@ -334,7 +332,7 @@ LIMIT 1", __FILE__, __LINE__);
 		// Check for expired rallyes
 		$result = SQL_QUERY("SELECT SQL_SMALL_RESULT d.id, d.title, d.start_time, d.end_time, d.send_notify".$ADD2."
 FROM "._MYSQL_PREFIX."_rallye_data AS d
-WHERE d.is_active='Y' AND d.notified='Y' AND d.expired='N' AND (d.end_time <= ".time()."".$OR.")
+WHERE d.is_active='Y' AND d.notified='Y' AND d.expired='N' AND (d.end_time <= UNIX_TIMESTAMP()".$OR.")
 LIMIT 1", __FILE__, __LINE__);
 		if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("autopurge")))
 		{