Completed
Branch work-fleets (5b06a4)
by SuperNova.WS
04:52
created
includes/update_old.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
     upd_do_query("UPDATE `{{planets}}` SET `crystal` = 0 WHERE `crystal` < 0;");
333 333
     upd_do_query("UPDATE `{{planets}}` SET `deuterium` = 0 WHERE `deuterium` < 0;");
334 334
     upd_alter_table('planets', array(
335
-       "DROP COLUMN `b_building`",
336
-       "DROP COLUMN `b_building_id`"
335
+        "DROP COLUMN `b_building`",
336
+        "DROP COLUMN `b_building_id`"
337 337
     ), $update_tables['planets']['b_building']);
338 338
 
339 339
     upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('noobprotection', 'noobprotectionmulti', 'noobprotectiontime', 'chat_admin_msgFormat');");
@@ -587,8 +587,8 @@  discard block
 block discarded – undo
587 587
       upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.ally_id = a.id SET u.ally_name = a.ally_name, u.ally_tag = a.ally_tag WHERE u.ally_id IS NOT NULL;");
588 588
 
589 589
       upd_alter_table('users', array(
590
-         "ADD CONSTRAINT `FK_users_ally_id` FOREIGN KEY (`ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
591
-         "ADD CONSTRAINT `FK_users_ally_name` FOREIGN KEY (`ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE SET NULL ON UPDATE CASCADE",
590
+          "ADD CONSTRAINT `FK_users_ally_id` FOREIGN KEY (`ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
591
+          "ADD CONSTRAINT `FK_users_ally_name` FOREIGN KEY (`ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE SET NULL ON UPDATE CASCADE",
592 592
       ), !$update_foreigns['users']['FK_users_ally_id']);
593 593
     }
594 594
 
@@ -1155,46 +1155,46 @@  discard block
 block discarded – undo
1155 1155
       upd_do_query('DELETE FROM {{statpoints}} WHERE id_owner NOT IN (SELECT id FROM {{users}}) OR id_ally NOT IN (SELECT id FROM {{alliance}});', true);
1156 1156
 
1157 1157
       upd_alter_table('statpoints', array(
1158
-       "MODIFY COLUMN `stat_date` int(11) NOT NULL DEFAULT '0' FIRST",
1159
-       "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
1160
-       "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
1161
-       "MODIFY COLUMN `stat_type` TINYINT UNSIGNED DEFAULT 0",
1162
-       "MODIFY COLUMN `stat_code` TINYINT UNSIGNED NOT NULL DEFAULT '0'",
1163
-
1164
-       "MODIFY COLUMN `tech_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1165
-       "MODIFY COLUMN `tech_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1166
-       "MODIFY COLUMN `tech_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1167
-       "MODIFY COLUMN `tech_count` DECIMAL(65,0) UNSIGNED UNSIGNED NOT NULL DEFAULT '0'",
1168
-
1169
-       "MODIFY COLUMN `build_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1170
-       "MODIFY COLUMN `build_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1171
-       "MODIFY COLUMN `build_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1172
-       "MODIFY COLUMN `build_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1173
-
1174
-       "MODIFY COLUMN `defs_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1175
-       "MODIFY COLUMN `defs_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1176
-       "MODIFY COLUMN `defs_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1177
-       "MODIFY COLUMN `defs_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1178
-
1179
-       "MODIFY COLUMN `fleet_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1180
-       "MODIFY COLUMN `fleet_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1181
-       "MODIFY COLUMN `fleet_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1182
-       "MODIFY COLUMN `fleet_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1183
-
1184
-       "MODIFY COLUMN `res_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Rank by resources' AFTER `fleet_count`",
1185
-       "MODIFY COLUMN `res_old_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Old rank by resources'AFTER `res_rank`",
1186
-       "MODIFY COLUMN `res_points` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource stat points' AFTER `res_old_rank`",
1187
-       "MODIFY COLUMN `res_count` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource count' AFTER `res_points`",
1188
-
1189
-       "MODIFY COLUMN `total_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1190
-       "MODIFY COLUMN `total_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1191
-       "MODIFY COLUMN `total_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1192
-       "MODIFY COLUMN `total_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1193
-
1194
-       "ADD KEY `I_stats_id_ally` (`id_ally`)",
1195
-
1196
-       "ADD CONSTRAINT `FK_stats_id_owner` FOREIGN KEY (`id_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
1197
-       "ADD CONSTRAINT `FK_stats_id_ally` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
1158
+        "MODIFY COLUMN `stat_date` int(11) NOT NULL DEFAULT '0' FIRST",
1159
+        "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
1160
+        "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
1161
+        "MODIFY COLUMN `stat_type` TINYINT UNSIGNED DEFAULT 0",
1162
+        "MODIFY COLUMN `stat_code` TINYINT UNSIGNED NOT NULL DEFAULT '0'",
1163
+
1164
+        "MODIFY COLUMN `tech_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1165
+        "MODIFY COLUMN `tech_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1166
+        "MODIFY COLUMN `tech_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1167
+        "MODIFY COLUMN `tech_count` DECIMAL(65,0) UNSIGNED UNSIGNED NOT NULL DEFAULT '0'",
1168
+
1169
+        "MODIFY COLUMN `build_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1170
+        "MODIFY COLUMN `build_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1171
+        "MODIFY COLUMN `build_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1172
+        "MODIFY COLUMN `build_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1173
+
1174
+        "MODIFY COLUMN `defs_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1175
+        "MODIFY COLUMN `defs_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1176
+        "MODIFY COLUMN `defs_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1177
+        "MODIFY COLUMN `defs_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1178
+
1179
+        "MODIFY COLUMN `fleet_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1180
+        "MODIFY COLUMN `fleet_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1181
+        "MODIFY COLUMN `fleet_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1182
+        "MODIFY COLUMN `fleet_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1183
+
1184
+        "MODIFY COLUMN `res_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Rank by resources' AFTER `fleet_count`",
1185
+        "MODIFY COLUMN `res_old_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Old rank by resources'AFTER `res_rank`",
1186
+        "MODIFY COLUMN `res_points` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource stat points' AFTER `res_old_rank`",
1187
+        "MODIFY COLUMN `res_count` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource count' AFTER `res_points`",
1188
+
1189
+        "MODIFY COLUMN `total_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1190
+        "MODIFY COLUMN `total_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
1191
+        "MODIFY COLUMN `total_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1192
+        "MODIFY COLUMN `total_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
1193
+
1194
+        "ADD KEY `I_stats_id_ally` (`id_ally`)",
1195
+
1196
+        "ADD CONSTRAINT `FK_stats_id_owner` FOREIGN KEY (`id_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
1197
+        "ADD CONSTRAINT `FK_stats_id_ally` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
1198 1198
       ), true);
1199 1199
     }
1200 1200
 
Please login to merge, or discard this patch.
includes/functions/sys_user.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: Gorlum
5
- * Date: 17.04.2015
6
- * Time: 6:37
7
- */
3
+   * Created by PhpStorm.
4
+   * User: Gorlum
5
+   * Date: 17.04.2015
6
+   * Time: 6:37
7
+   */
8 8
 
9 9
 function sys_user_vacation($user) {
10 10
   global $config;
Please login to merge, or discard this patch.
includes/pages/chat.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,26 +1,26 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * chat.php
4
- * Main chat window
5
- *
6
- * Changelog:
7
- * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
8
- * [!] Another rewrite
9
- * [+] preMVC-compatible
10
- * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
11
- * [!] Almost full rewrote
12
- * [+] Complies with PCG1
13
- * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
14
- * [+] Rewrote to remove unnecessary code dupes
15
- * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
16
- * [~] More DDoS-realted fixes
17
- * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
18
- * [~] DDoS-realted fixes
19
- * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
20
- * [~] Security checks for SQL-injection
21
- * 1.2 by Ihor
22
- * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
23
- **/
3
+   * chat.php
4
+   * Main chat window
5
+   *
6
+   * Changelog:
7
+   * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
8
+   * [!] Another rewrite
9
+   * [+] preMVC-compatible
10
+   * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
11
+   * [!] Almost full rewrote
12
+   * [+] Complies with PCG1
13
+   * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
14
+   * [+] Rewrote to remove unnecessary code dupes
15
+   * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
16
+   * [~] More DDoS-realted fixes
17
+   * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
18
+   * [~] DDoS-realted fixes
19
+   * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
20
+   * [~] Security checks for SQL-injection
21
+   * 1.2 by Ihor
22
+   * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
23
+   **/
24 24
 /*
25 25
 $sn_mvc['model']['chat'][] = 'sn_chat_model';
26 26
 $sn_mvc['model']['chat_add'][] = 'sn_chat_add_model';
Please login to merge, or discard this patch.
includes/db/db_queries_fleet.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * DB ACS functions
4
- */
3
+   * DB ACS functions
4
+   */
5 5
 
6 6
 /* ACS ****************************************************************************************************************/
7 7
 /**
Please login to merge, or discard this patch.
includes/debug.class.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Some helpers to sweeten dev's life
4
- */
3
+   * Some helpers to sweeten dev's life
4
+   */
5 5
 
6 6
 /*
7 7
  * debug.class.php ::  Clase Debug, maneja reporte de eventos
Please login to merge, or discard this patch.
includes/db/db_helpers.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: Gorlum
5
- * Date: 26.12.2015
6
- * Time: 17:19
7
- */
3
+   * Created by PhpStorm.
4
+   * User: Gorlum
5
+   * Date: 26.12.2015
6
+   * Time: 17:19
7
+   */
8 8
 
9 9
 /**
10 10
  * Normalize and make ID safe
Please login to merge, or discard this patch.
overview.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,32 +1,32 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * index.php - overview.php
4
- *
5
- * 2.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
6
- *     [-] Removed News frame
7
- *     [-] Time & Usersonline moved to Top-Frame
8
- * 2.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
9
- *     [*] Complying with PCG
10
- * 2.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
11
- *     [+] Redo flying fleet list
12
- * 2.1 - copyright (c) 2010 by Gorlum for http://supernova.ws
13
- *     [+] Planets on planet list now have indication of planet fill
14
- *     [+] Planets on planet list now have indication when there is enemy fleet flying to planet
15
- * 2.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
16
- *     [+] Now there is full planet list on right side of screen a-la oGame
17
- *     [+] Planet list now include icons for buildings/tech/fleet on progress
18
- * 1.5 - copyright (c) 2010 by Gorlum for http://supernova.ws
19
- *     [*] Subplanet timers now use sn_timer.js library
20
- * 1.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
21
- *     [*] All mainplanet timers now use new sn_timer.js library
22
- * 1.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
23
- *     [*] Adjusted layouts of player infos
24
- * 1.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
25
- *     [*] Adjusted layouts of planet infos
26
- * 1.1 - Security checks by Gorlum for http://supernova.ws
27
- * @version 1
28
- * @copyright 2008 By Chlorel for XNova
29
- */
3
+   * index.php - overview.php
4
+   *
5
+   * 2.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
6
+   *     [-] Removed News frame
7
+   *     [-] Time & Usersonline moved to Top-Frame
8
+   * 2.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
9
+   *     [*] Complying with PCG
10
+   * 2.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
11
+   *     [+] Redo flying fleet list
12
+   * 2.1 - copyright (c) 2010 by Gorlum for http://supernova.ws
13
+   *     [+] Planets on planet list now have indication of planet fill
14
+   *     [+] Planets on planet list now have indication when there is enemy fleet flying to planet
15
+   * 2.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
16
+   *     [+] Now there is full planet list on right side of screen a-la oGame
17
+   *     [+] Planet list now include icons for buildings/tech/fleet on progress
18
+   * 1.5 - copyright (c) 2010 by Gorlum for http://supernova.ws
19
+   *     [*] Subplanet timers now use sn_timer.js library
20
+   * 1.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
21
+   *     [*] All mainplanet timers now use new sn_timer.js library
22
+   * 1.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
23
+   *     [*] Adjusted layouts of player infos
24
+   * 1.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
25
+   *     [*] Adjusted layouts of planet infos
26
+   * 1.1 - Security checks by Gorlum for http://supernova.ws
27
+   * @version 1
28
+   * @copyright 2008 By Chlorel for XNova
29
+   */
30 30
 
31 31
 //define('SN_RENDER_NAVBAR_PLANET', false);
32 32
 
Please login to merge, or discard this patch.
resources.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 
93 93
 for ($Option = 10; $Option >= 0; $Option--)
94 94
 {
95
- $template->assign_block_vars('option', array(
96
-   'VALUE' => $Option * 10,
97
- ));
95
+  $template->assign_block_vars('option', array(
96
+    'VALUE' => $Option * 10,
97
+  ));
98 98
 }
99 99
 
100 100
 $caps_real = eco_get_planet_caps($user, $planetrow, 3600);
@@ -163,14 +163,14 @@  discard block
 block discarded – undo
163 163
 int_calc_storage_bar(RES_DEUTERIUM);
164 164
 
165 165
 $template->assign_vars(array(
166
- 'PLANET_NAME'          => $planetrow['name'],
167
- 'PLANET_TYPE'          => $planetrow['planet_type'],
168
- 'PLANET_DENSITY_INDEX' => $planet_density_index,
169
- 'PLANET_CORE_TEXT'     => classLocale::$lang['uni_planet_density_types'][$planet_density_index],
166
+  'PLANET_NAME'          => $planetrow['name'],
167
+  'PLANET_TYPE'          => $planetrow['planet_type'],
168
+  'PLANET_DENSITY_INDEX' => $planet_density_index,
169
+  'PLANET_CORE_TEXT'     => classLocale::$lang['uni_planet_density_types'][$planet_density_index],
170 170
 
171
- 'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
171
+  'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
172 172
 
173
- 'PAGE_HINT'            => classLocale::$lang['res_hint'],
173
+  'PAGE_HINT'            => classLocale::$lang['res_hint'],
174 174
 ));
175 175
 
176 176
 display($template, classLocale::$lang['res_planet_production']);
Please login to merge, or discard this patch.