@@ -92,9 +92,9 @@ discard block |
||
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 |
||
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' => $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' => $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' => $lang['res_hint'], |
|
173 | + 'PAGE_HINT' => $lang['res_hint'], |
|
174 | 174 | )); |
175 | 175 | |
176 | 176 | display($template, $lang['res_planet_production']); |
@@ -39,8 +39,8 @@ |
||
39 | 39 | 0 => $row['visit_time'], // start |
40 | 40 | 1 => $row['visit_time'], // end |
41 | 41 | ) |
42 | - //: false |
|
43 | - ; |
|
42 | + //: false |
|
43 | + ; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | $session_list = array(); |
@@ -50,52 +50,52 @@ |
||
50 | 50 | stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common); |
51 | 51 | |
52 | 52 | $stat_types = array( |
53 | - STAT_TOTAL => array( |
|
54 | - 'type' => 'total', |
|
55 | - ), |
|
53 | + STAT_TOTAL => array( |
|
54 | + 'type' => 'total', |
|
55 | + ), |
|
56 | 56 | |
57 | - STAT_FLEET => array( |
|
58 | - 'type' => 'fleet', |
|
59 | - ), |
|
57 | + STAT_FLEET => array( |
|
58 | + 'type' => 'fleet', |
|
59 | + ), |
|
60 | 60 | |
61 | - STAT_TECH => array( |
|
62 | - 'type' => 'tech', |
|
63 | - ), |
|
61 | + STAT_TECH => array( |
|
62 | + 'type' => 'tech', |
|
63 | + ), |
|
64 | 64 | |
65 | - STAT_BUILDING => array( |
|
66 | - 'type' => 'build', |
|
67 | - ), |
|
65 | + STAT_BUILDING => array( |
|
66 | + 'type' => 'build', |
|
67 | + ), |
|
68 | 68 | |
69 | - STAT_DEFENSE => array( |
|
70 | - 'type' => 'defs', |
|
71 | - ), |
|
69 | + STAT_DEFENSE => array( |
|
70 | + 'type' => 'defs', |
|
71 | + ), |
|
72 | 72 | |
73 | - STAT_RESOURCE => array( |
|
74 | - 'type' => 'res', |
|
75 | - ), |
|
73 | + STAT_RESOURCE => array( |
|
74 | + 'type' => 'res', |
|
75 | + ), |
|
76 | 76 | |
77 | - STAT_RAID_TOTAL => array( |
|
78 | - 'type' => 'raids', |
|
79 | - ), |
|
77 | + STAT_RAID_TOTAL => array( |
|
78 | + 'type' => 'raids', |
|
79 | + ), |
|
80 | 80 | |
81 | - STAT_RAID_WON => array( |
|
82 | - 'type' => 'raidswin', |
|
83 | - ), |
|
81 | + STAT_RAID_WON => array( |
|
82 | + 'type' => 'raidswin', |
|
83 | + ), |
|
84 | 84 | |
85 | - STAT_RAID_LOST => array( |
|
86 | - 'type' => 'raidsloose', |
|
87 | - ), |
|
85 | + STAT_RAID_LOST => array( |
|
86 | + 'type' => 'raidsloose', |
|
87 | + ), |
|
88 | 88 | |
89 | 89 | STAT_LVL_BUILDING => array( |
90 | - 'type' => 'lvl_minier', |
|
90 | + 'type' => 'lvl_minier', |
|
91 | 91 | ), |
92 | 92 | |
93 | 93 | STAT_LVL_TECH => array( |
94 | - 'type' => 'player_rpg_tech_level', |
|
94 | + 'type' => 'player_rpg_tech_level', |
|
95 | 95 | ), |
96 | 96 | |
97 | 97 | STAT_LVL_RAID => array( |
98 | - 'type' => 'lvl_raid', |
|
98 | + 'type' => 'lvl_raid', |
|
99 | 99 | ), |
100 | 100 | ); |
101 | 101 | stat_tpl_assign($template, $type, 'type', $stat_types, $sn_group_stat_common); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | */ |
29 | 29 | if (!defined('INSIDE')) |
30 | 30 | { |
31 | - die('Hack attempt!'); |
|
31 | + die('Hack attempt!'); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | $lang_info = array( |
@@ -689,15 +689,15 @@ discard block |
||
689 | 689 | ), |
690 | 690 | |
691 | 691 | 'months' => array( |
692 | - 1 =>'января', |
|
693 | - 2 =>'февраля', |
|
694 | - 3 =>'марта', |
|
695 | - 4 =>'апреля', |
|
696 | - 5 =>'мая', |
|
697 | - 6 =>'июня', |
|
698 | - 7 =>'июля', |
|
699 | - 8 =>'августа', |
|
700 | - 9 =>'сентября', |
|
692 | + 1 =>'января', |
|
693 | + 2 =>'февраля', |
|
694 | + 3 =>'марта', |
|
695 | + 4 =>'апреля', |
|
696 | + 5 =>'мая', |
|
697 | + 6 =>'июня', |
|
698 | + 7 =>'июля', |
|
699 | + 8 =>'августа', |
|
700 | + 9 =>'сентября', |
|
701 | 701 | 10 =>'октября', |
702 | 702 | 11 =>'ноября', |
703 | 703 | 12 =>'декабря' |
@@ -993,7 +993,7 @@ discard block |
||
993 | 993 | PASSWORD_RESTORE_ERROR_ACCOUNT_NOT_EXISTS => 'Внутренняя ошибка - при смене пароля аккаунт не найден! Сообщите об этой ошибке Администрации!', |
994 | 994 | AUTH_PASSWORD_RESET_INSIDE_ERROR_NO_ACCOUNT_FOR_CONFIRMATION => 'ВНУТРЕННЯЯ ОШИБКА! Нет аккаунтов для сброса пароля при корректном коде подтверждения! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!', |
995 | 995 | LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET => 'ВНУТРЕННЯЯ ОШИБКА! СООБЩИТЕ АДМИНИСТРАЦИИ! Не установлен аккаунт при cookie_set()! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!', |
996 | - ), |
|
996 | + ), |
|
997 | 997 | |
998 | 998 | 'log_reg_email_title' => "Ваша регистрация на сервере %1\$s игры СуперНова", |
999 | 999 | 'log_reg_email_text' => "Подтверждение регистрации для %3\$s\r\n\r\n |
@@ -169,14 +169,14 @@ |
||
169 | 169 | return classSupernova::db_changeset_apply($db_changeset); |
170 | 170 | } |
171 | 171 | /** |
172 | - * Функция проверяет статус транзакции |
|
173 | - * |
|
174 | - * @param null|true|false $status Должна ли быть запущена транзакция в момент проверки |
|
175 | - * <p>null - транзакция НЕ должна быть запущена</p> |
|
176 | - * <p>true - транзакция должна быть запущена - для совместимости с $for_update</p> |
|
177 | - * <p>false - всё равно - для совместимости с $for_update</p> |
|
178 | - * @return bool Текущий статус транзакции |
|
179 | - */ |
|
172 | + * Функция проверяет статус транзакции |
|
173 | + * |
|
174 | + * @param null|true|false $status Должна ли быть запущена транзакция в момент проверки |
|
175 | + * <p>null - транзакция НЕ должна быть запущена</p> |
|
176 | + * <p>true - транзакция должна быть запущена - для совместимости с $for_update</p> |
|
177 | + * <p>false - всё равно - для совместимости с $for_update</p> |
|
178 | + * @return bool Текущий статус транзакции |
|
179 | + */ |
|
180 | 180 | function sn_db_transaction_check($transaction_should_be_started = null) { |
181 | 181 | return classSupernova::db_transaction_check($transaction_should_be_started); |
182 | 182 | } |
@@ -16,23 +16,23 @@ discard block |
||
16 | 16 | $sn_menu_admin_extra = array(); |
17 | 17 | |
18 | 18 | $sn_mvc = array( |
19 | - 'model' => array( |
|
20 | - 'options' => array('sn_options_model'), |
|
21 | - 'chat' => array('sn_chat_model'), |
|
22 | - 'chat_add' => array('sn_chat_add_model'), |
|
23 | - ), |
|
24 | - 'view' => array( |
|
25 | - 'options' => array('sn_options_view'), |
|
26 | - 'chat' => array('sn_chat_view'), |
|
27 | - 'chat_msg' => array('sn_chat_msg_view'), |
|
28 | - ), |
|
29 | - 'controller' => array(), |
|
30 | - 'i18n' => array( |
|
31 | - 'options' => array( |
|
32 | - 'options' => 'options', |
|
33 | - 'messages' => 'messages', |
|
34 | - ), |
|
35 | - ), |
|
19 | + 'model' => array( |
|
20 | + 'options' => array('sn_options_model'), |
|
21 | + 'chat' => array('sn_chat_model'), |
|
22 | + 'chat_add' => array('sn_chat_add_model'), |
|
23 | + ), |
|
24 | + 'view' => array( |
|
25 | + 'options' => array('sn_options_view'), |
|
26 | + 'chat' => array('sn_chat_view'), |
|
27 | + 'chat_msg' => array('sn_chat_msg_view'), |
|
28 | + ), |
|
29 | + 'controller' => array(), |
|
30 | + 'i18n' => array( |
|
31 | + 'options' => array( |
|
32 | + 'options' => 'options', |
|
33 | + 'messages' => 'messages', |
|
34 | + ), |
|
35 | + ), |
|
36 | 36 | ); |
37 | 37 | |
38 | 38 | $note_priority_classes = array( |
@@ -120,62 +120,62 @@ discard block |
||
120 | 120 | ); |
121 | 121 | |
122 | 122 | $sn_message_class_list = array( |
123 | - MSG_TYPE_NEW => array( |
|
124 | - 'name' => 'new_message', |
|
125 | - 'switchable' => false, |
|
126 | - 'email' => false, |
|
127 | - ), |
|
128 | - MSG_TYPE_ADMIN => array( |
|
129 | - 'name' => 'msg_admin', |
|
130 | - 'switchable' => false, |
|
131 | - 'email' => true, |
|
132 | - ), |
|
133 | - MSG_TYPE_PLAYER => array( |
|
134 | - 'name' => 'mnl_joueur', |
|
135 | - 'switchable' => false, |
|
136 | - 'email' => true, |
|
137 | - ), |
|
138 | - MSG_TYPE_ALLIANCE => array( |
|
139 | - 'name' => 'mnl_alliance', |
|
140 | - 'switchable' => false, |
|
141 | - 'email' => true, |
|
142 | - ), |
|
143 | - MSG_TYPE_SPY => array( |
|
144 | - 'name' => 'mnl_spy', |
|
145 | - 'switchable' => true, |
|
146 | - 'email' => true, |
|
147 | - ), |
|
148 | - MSG_TYPE_COMBAT => array( |
|
149 | - 'name' => 'mnl_attaque', |
|
150 | - 'switchable' => true, |
|
151 | - 'email' => true, |
|
152 | - ), |
|
153 | - MSG_TYPE_TRANSPORT => array( |
|
154 | - 'name' => 'mnl_transport', |
|
155 | - 'switchable' => true, |
|
156 | - 'email' => true, |
|
157 | - ), |
|
158 | - MSG_TYPE_RECYCLE => array( |
|
159 | - 'name' => 'mnl_exploit', |
|
160 | - 'switchable' => true, |
|
161 | - 'email' => true, |
|
162 | - ), |
|
163 | - MSG_TYPE_EXPLORE => array( |
|
164 | - 'name' => 'mnl_expedition', |
|
165 | - 'switchable' => true, |
|
166 | - 'email' => true, |
|
167 | - ), |
|
168 | - // 97 => 'mnl_general', |
|
169 | - MSG_TYPE_QUE => array( |
|
170 | - 'name' => 'mnl_buildlist', |
|
171 | - 'switchable' => true, |
|
172 | - 'email' => true, |
|
173 | - ), |
|
174 | - MSG_TYPE_OUTBOX => array( |
|
175 | - 'name' => 'mnl_outbox', |
|
176 | - 'switchable' => false, |
|
177 | - 'email' => false, |
|
178 | - ), |
|
123 | + MSG_TYPE_NEW => array( |
|
124 | + 'name' => 'new_message', |
|
125 | + 'switchable' => false, |
|
126 | + 'email' => false, |
|
127 | + ), |
|
128 | + MSG_TYPE_ADMIN => array( |
|
129 | + 'name' => 'msg_admin', |
|
130 | + 'switchable' => false, |
|
131 | + 'email' => true, |
|
132 | + ), |
|
133 | + MSG_TYPE_PLAYER => array( |
|
134 | + 'name' => 'mnl_joueur', |
|
135 | + 'switchable' => false, |
|
136 | + 'email' => true, |
|
137 | + ), |
|
138 | + MSG_TYPE_ALLIANCE => array( |
|
139 | + 'name' => 'mnl_alliance', |
|
140 | + 'switchable' => false, |
|
141 | + 'email' => true, |
|
142 | + ), |
|
143 | + MSG_TYPE_SPY => array( |
|
144 | + 'name' => 'mnl_spy', |
|
145 | + 'switchable' => true, |
|
146 | + 'email' => true, |
|
147 | + ), |
|
148 | + MSG_TYPE_COMBAT => array( |
|
149 | + 'name' => 'mnl_attaque', |
|
150 | + 'switchable' => true, |
|
151 | + 'email' => true, |
|
152 | + ), |
|
153 | + MSG_TYPE_TRANSPORT => array( |
|
154 | + 'name' => 'mnl_transport', |
|
155 | + 'switchable' => true, |
|
156 | + 'email' => true, |
|
157 | + ), |
|
158 | + MSG_TYPE_RECYCLE => array( |
|
159 | + 'name' => 'mnl_exploit', |
|
160 | + 'switchable' => true, |
|
161 | + 'email' => true, |
|
162 | + ), |
|
163 | + MSG_TYPE_EXPLORE => array( |
|
164 | + 'name' => 'mnl_expedition', |
|
165 | + 'switchable' => true, |
|
166 | + 'email' => true, |
|
167 | + ), |
|
168 | + // 97 => 'mnl_general', |
|
169 | + MSG_TYPE_QUE => array( |
|
170 | + 'name' => 'mnl_buildlist', |
|
171 | + 'switchable' => true, |
|
172 | + 'email' => true, |
|
173 | + ), |
|
174 | + MSG_TYPE_OUTBOX => array( |
|
175 | + 'name' => 'mnl_outbox', |
|
176 | + 'switchable' => false, |
|
177 | + 'email' => false, |
|
178 | + ), |
|
179 | 179 | ); |
180 | 180 | |
181 | 181 | $sn_message_groups = array( |
@@ -1027,7 +1027,7 @@ discard block |
||
1027 | 1027 | SHIP_HUGE_DEATH_STAR => SHIP_HUGE_DEATH_STAR, SHIP_HUGE_SUPERNOVA => SHIP_HUGE_SUPERNOVA, |
1028 | 1028 | SHIP_CARGO_SMALL => SHIP_CARGO_SMALL, SHIP_CARGO_BIG => SHIP_CARGO_BIG, SHIP_CARGO_SUPER => SHIP_CARGO_SUPER, SHIP_CARGO_HYPER => SHIP_CARGO_HYPER, |
1029 | 1029 | SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR |
1030 | - ), |
|
1030 | + ), |
|
1031 | 1031 | // Defensive building list |
1032 | 1032 | 'defense' => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL, |
1033 | 1033 | UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS, |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Created by PhpStorm. |
|
4 | - * User: Gorlum |
|
5 | - * Date: 13.04.2015 |
|
6 | - * Time: 6:27 |
|
7 | - */ |
|
3 | + * Created by PhpStorm. |
|
4 | + * User: Gorlum |
|
5 | + * Date: 13.04.2015 |
|
6 | + * Time: 6:27 |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | function db_account_by_user_id($user_id_safe, &$result = null) { |
10 | 10 | die('db_account_by_user_id() должна быть реализована в класса core_auth!'); |
@@ -62,8 +62,8 @@ |
||
62 | 62 | if($mercenary_level) { |
63 | 63 | $darkmater_cost = eco_get_total_cost($mercenary_id, $mercenary_level); |
64 | 64 | if(!$config->empire_mercenary_temporary && $mercenary_level_old) { |
65 | - $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old); |
|
66 | - $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER]; |
|
65 | + $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old); |
|
66 | + $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER]; |
|
67 | 67 | } |
68 | 68 | $darkmater_cost = ceil($darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] * $mercenary_period * $sn_powerup_buy_discounts[$mercenary_period] / $config->empire_mercenary_base_period); |
69 | 69 | } else { |