Merge branch 'develop'

Author: darknoon29

install.php

@@ -13,44 +13,15 @@
 
 define('TABLE_XTENSE_GROUPS', $table_prefix.'xtense_groups');
 define('TABLE_XTENSE_CALLBACKS', $table_prefix.'xtense_callbacks');
-define('TABLE_PARSEDREC', $table_prefix.'parsedRec');
-define('TABLE_PARSEDSPYEN', $table_prefix.'parsedSpyEn');
-
 
 $install_ogspy = false;
 $is_ok = false;
 $mod_folder = "xtense";
 $root = "xtense";
 $is_ok = install_mod($mod_folder);
-$db->sql_query("UPDATE " . TABLE_MOD . " SET menu = 'Xtense' WHERE title = 'xtense'");
-
 
 if ($is_ok) {
 
-		//---- Creation de la table des recyclages
-		$db->sql_query("CREATE TABLE IF NOT EXISTS " . TABLE_PARSEDREC . " (
-			`id_rec` INT( 255 ) NOT NULL AUTO_INCREMENT ,
-			`dateRec` INT( 11 ) NOT NULL ,
-			`coordinates` VARCHAR( 9 ) NOT NULL ,
-			`nbRec` INT( 11 ) NOT NULL ,
-			`M_total` INT( 11 ) NOT NULL ,
-			`C_total` INT( 11 ) NOT NULL ,
-			`M_recovered` INT( 11 ) NOT NULL ,
-			`C_recovered` INT( 11 ) NOT NULL ,
-			`sender_id` INT( 11 ) NOT NULL ,
-			PRIMARY KEY ( `id_rec` )
-		) DEFAULT CHARSET=utf8;");
-
-		$db->sql_query("CREATE TABLE IF NOT EXISTS " . TABLE_PARSEDSPYEN . " (
-            `spy_id` INT( 255 ) NOT NULL AUTO_INCREMENT ,
-            `dateSpy` INT( 11 ) NOT NULL ,
-            `from` VARCHAR( 9 ) NOT NULL ,
-            `to` VARCHAR( 9 ) NOT NULL ,
-            `proba` INT( 3 ) NOT NULL ,
-            `sender_id` INT( 11 ) NOT NULL ,
-            PRIMARY KEY ( `spy_id` )
-        )DEFAULT CHARSET=utf8;");
-
 		//---- Creation de la table des Callbacks
 		$db->sql_query("CREATE TABLE IF NOT EXISTS `" . TABLE_XTENSE_CALLBACKS . "` (
 			`id` int(3) NOT NULL auto_increment,
@@ -80,6 +51,4 @@
         generate_all_cache();
 		$db->sql_query("REPLACE INTO " .TABLE_XTENSE_GROUPS. " (`group_id`, `system`, `ranking`, `empire`, `messages`) VALUES
 			('1', '1', '1', '1', '1')");
-
-
 }

update.php

@@ -27,12 +27,5 @@
 $db->sql_query('DELETE FROM '.TABLE_CONFIG.' WHERE `name` LIKE "xtense_log"');
 $db->sql_query('DELETE FROM '.TABLE_CONFIG.' WHERE `name` LIKE "xtense_keep_log"');
 
-$result = $db->sql_query("SELECT `version` FROM ".TABLE_MOD." WHERE `title` = 'xtense'");
-list($version) = $db->sql_fetch_row($result);
-
-if(version_compare($version, '2.7.2', '<')){
-    $db->sql_query("ALTER TABLE ".TABLE_XTENSE_CALLBACKS." MODIFY `type` enum('overview','system','ally_list','buildings','research','fleet','fleetSending','defense','spy', 'spy_shared', 'ennemy_spy','rc', 'rc_shared','rc_cdr', 'msg', 'ally_msg', 'expedition','expedition_shared', 'ranking', 'trade', 'trade_me','hostiles') NOT NULL");
-}
-
 update_mod($mod_folder, $mod_name);
 generate_all_cache();

version.txt

@@ -1,5 +1,5 @@
 Xtense
-2.11.4
+2.11.5
 Xtense,Xtense,xtense,xtense,index.php,1,1
-4.0.0-dev
+4.0.0
 3.0.0