@@ -290,10 +290,12 @@ discard block |
||
| 290 | 290 | } |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - if ($fleet_id) // Не планета |
|
| 293 | + if ($fleet_id) { |
|
| 294 | + // Не планета |
|
| 294 | 295 | { |
| 295 | 296 | if ($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED) { |
| 296 | 297 | $new_fleet_count = 0; |
| 298 | + } |
|
| 297 | 299 | } |
| 298 | 300 | |
| 299 | 301 | if ($new_fleet_count) { |
@@ -316,10 +318,12 @@ discard block |
||
| 316 | 318 | } |
| 317 | 319 | DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp)); |
| 318 | 320 | } |
| 319 | - if (!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть |
|
| 321 | + if (!empty($db_changeset)) { |
|
| 322 | + // Сохраняем изменения юнитов на планете - если они есть |
|
| 320 | 323 | { |
| 321 | 324 | OldDbChangeSet::db_changeset_apply($db_changeset); |
| 322 | 325 | } |
| 326 | + } |
|
| 323 | 327 | } |
| 324 | 328 | } |
| 325 | 329 | |
@@ -236,9 +236,11 @@ |
||
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету |
| 239 | - if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet'] |
|
| 239 | + if (!isset($planet_row['id'])) { |
|
| 240 | + // || $planet_row['id'] != $user['current_planet'] |
|
| 240 | 241 | { |
| 241 | 242 | $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id'); |
| 243 | + } |
|
| 242 | 244 | // Если текущей планеты не существует - выставляем Столицу |
| 243 | 245 | if (!isset($planet_row['id'])) { |
| 244 | 246 | $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id'); |
@@ -24,7 +24,9 @@ |
||
| 24 | 24 | * DO NOT CHANGE |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | -if (!defined('INSIDE')) die(); |
|
| 27 | +if (!defined('INSIDE')) { |
|
| 28 | + die(); |
|
| 29 | +} |
|
| 28 | 30 | |
| 29 | 31 | $a_lang_array = array( |
| 30 | 32 | 'built' => 'Построено', |
@@ -26,7 +26,9 @@ |
||
| 26 | 26 | * DO NOT CHANGE |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!defined('INSIDE')) die(); |
|
| 29 | +if (!defined('INSIDE')) { |
|
| 30 | + die(); |
|
| 31 | +} |
|
| 30 | 32 | |
| 31 | 33 | |
| 32 | 34 | $a_lang_array = array( |
@@ -7,8 +7,7 @@ discard block |
||
| 7 | 7 | use DBAL\OldDbChangeSet; |
| 8 | 8 | use Planet\DBStaticPlanet; |
| 9 | 9 | |
| 10 | -function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0') |
|
| 11 | -{ |
|
| 10 | +function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0') { |
|
| 12 | 11 | // Here we select which part of defense should take damage: structure or shield |
| 13 | 12 | // $damageTo = P_SHIELD; |
| 14 | 13 | // $damageTo = P_STRUCTURE; |
@@ -37,8 +36,7 @@ discard block |
||
| 37 | 36 | $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] ); |
| 38 | 37 | $structures[$targetedStructure][0] -= $structsDestroyed; |
| 39 | 38 | $MIPDamage -= $structsDestroyed*$damageDone; |
| 40 | - } |
|
| 41 | - else |
|
| 39 | + } else |
|
| 42 | 40 | { |
| 43 | 41 | // REALLY random attack |
| 44 | 42 | $can_be_damaged = sn_get_groups('defense_active'); |
@@ -3,8 +3,7 @@ discard block |
||
| 3 | 3 | |
| 4 | 4 | use Planet\DBStaticPlanet; |
| 5 | 5 | |
| 6 | -function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) |
|
| 7 | -{ |
|
| 6 | +function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) { |
|
| 8 | 7 | global $config, $user, $fleet_number, $lang; |
| 9 | 8 | |
| 10 | 9 | $fleet_events = array(); |
@@ -25,12 +24,10 @@ discard block |
||
| 25 | 24 | if($fleet['fleet_end_planet'] > $config->game_maxPlanet) |
| 26 | 25 | { |
| 27 | 26 | $fleet['fleet_end_name'] = $lang['ov_fleet_exploration']; |
| 28 | - } |
|
| 29 | - elseif($fleet['fleet_mission'] == MT_COLONIZE) |
|
| 27 | + } elseif($fleet['fleet_mission'] == MT_COLONIZE) |
|
| 30 | 28 | { |
| 31 | 29 | $fleet['fleet_end_name'] = $lang['ov_fleet_colonization']; |
| 32 | - } |
|
| 33 | - else |
|
| 30 | + } else |
|
| 34 | 31 | { |
| 35 | 32 | $planet_end = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_end_galaxy'], $fleet['fleet_end_system'], $fleet['fleet_end_planet'], $planet_end_type, false, 'name'); |
| 36 | 33 | $fleet['fleet_end_name'] = $planet_end['name']; |
@@ -82,8 +79,7 @@ discard block |
||
| 82 | 79 | return $fleet_events; |
| 83 | 80 | } |
| 84 | 81 | |
| 85 | -function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) |
|
| 86 | -{ |
|
| 82 | +function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) { |
|
| 87 | 83 | global $user, $planetrow, $fleet_number; |
| 88 | 84 | |
| 89 | 85 | switch($fleet['ov_label'] = $ov_label) |
@@ -123,8 +119,7 @@ discard block |
||
| 123 | 119 | if($fleet['fleet_owner'] == $user['id']) |
| 124 | 120 | { |
| 125 | 121 | $user_data = $user; |
| 126 | - } |
|
| 127 | - else |
|
| 122 | + } else |
|
| 128 | 123 | { |
| 129 | 124 | $user_data = db_user_by_id($fleet['fleet_owner']); |
| 130 | 125 | } |
@@ -136,8 +131,7 @@ discard block |
||
| 136 | 131 | * @param array $planetrow |
| 137 | 132 | * @param template $template |
| 138 | 133 | */ |
| 139 | -function int_planet_pretemplate($planetrow, &$template) |
|
| 140 | -{ |
|
| 134 | +function int_planet_pretemplate($planetrow, &$template) { |
|
| 141 | 135 | global $lang, $user; |
| 142 | 136 | |
| 143 | 137 | $governor_id = $planetrow['PLANET_GOVERNOR_ID']; |
@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | use Que\DBStaticQue; |
| 6 | 6 | use Universe\Universe; |
| 7 | 7 | |
| 8 | -function art_use(&$user, &$planetrow, $unit_id) |
|
| 9 | -{ |
|
| 8 | +function art_use(&$user, &$planetrow, $unit_id) { |
|
| 10 | 9 | global $lang; |
| 11 | 10 | |
| 12 | 11 | if(!in_array($unit_id, sn_get_groups('artifacts'))) |
@@ -53,14 +52,12 @@ discard block |
||
| 53 | 52 | { |
| 54 | 53 | $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moonSize, $updateDebris); |
| 55 | 54 | $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), HelperString::numberFloorAndFormat($moonSize)); |
| 56 | - } |
|
| 57 | - else |
|
| 55 | + } else |
|
| 58 | 56 | { |
| 59 | 57 | $message = $lang['art_lhc_moon_fail']; |
| 60 | 58 | } |
| 61 | 59 | msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_ADMIN, $lang['art_lhc_from'], $lang['art_lhc_subj'], $message); |
| 62 | - } |
|
| 63 | - else |
|
| 60 | + } else |
|
| 64 | 61 | { |
| 65 | 62 | $message = $lang['art_moon_exists']; |
| 66 | 63 | } |
@@ -88,8 +85,9 @@ discard block |
||
| 88 | 85 | $sectors_used = 0; |
| 89 | 86 | foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level) |
| 90 | 87 | { |
| 91 | - if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) |
|
| 92 | - continue; |
|
| 88 | + if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) { |
|
| 89 | + continue; |
|
| 90 | + } |
|
| 93 | 91 | $sectors_used += $levels_deployed; |
| 94 | 92 | $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']); |
| 95 | 93 | } |
@@ -123,8 +121,7 @@ discard block |
||
| 123 | 121 | DBStaticQue::db_que_set_time_left_by_id($que_item['que_id'], $que_item['que_time_left']); |
| 124 | 122 | $message = sprintf($lang['art_heurestic_chip_ok'], $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], sys_time_human($old_time - $que_item['que_time_left'])); |
| 125 | 123 | msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_heurestic_chip_subj'], $lang['art_heurestic_chip_subj'], $message); |
| 126 | - } |
|
| 127 | - else |
|
| 124 | + } else |
|
| 128 | 125 | { |
| 129 | 126 | $message = $lang['art_heurestic_chip_no_research']; |
| 130 | 127 | } |
@@ -152,8 +149,7 @@ discard block |
||
| 152 | 149 | $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], $planetrow['name'], uni_render_coordinates($planetrow), sys_time_human($old_time - $que_item['que_time_left']) |
| 153 | 150 | ); |
| 154 | 151 | msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_nano_builder_subj'], $lang['art_nano_builder_subj'], $message); |
| 155 | - } |
|
| 156 | - else |
|
| 152 | + } else |
|
| 157 | 153 | { |
| 158 | 154 | $message = $lang['art_nano_builder_no_que']; |
| 159 | 155 | } |
@@ -165,8 +161,7 @@ discard block |
||
| 165 | 161 | $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user); |
| 166 | 162 | OldDbChangeSet::db_changeset_apply($db_changeset); |
| 167 | 163 | } |
| 168 | - } |
|
| 169 | - else |
|
| 164 | + } else |
|
| 170 | 165 | { |
| 171 | 166 | $message = $lang['art_err_no_artifact']; |
| 172 | 167 | } |
@@ -32,8 +32,7 @@ |
||
| 32 | 32 | * @author Fabien Potencier |
| 33 | 33 | * @author Dominik Zogg |
| 34 | 34 | */ |
| 35 | -interface ServiceProviderInterface |
|
| 36 | -{ |
|
| 35 | +interface ServiceProviderInterface { |
|
| 37 | 36 | /** |
| 38 | 37 | * Registers services on the given container. |
| 39 | 38 | * |
@@ -22,8 +22,7 @@ discard block |
||
| 22 | 22 | * Base Template class. |
| 23 | 23 | * @package phpBB3 |
| 24 | 24 | */ |
| 25 | -class template |
|
| 26 | -{ |
|
| 25 | +class template { |
|
| 27 | 26 | /** variable that holds all the data we'll be substituting into |
| 28 | 27 | * the compiled templates. Takes form: |
| 29 | 28 | * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value |
@@ -82,8 +81,7 @@ discard block |
||
| 82 | 81 | * Set template location |
| 83 | 82 | * @access public |
| 84 | 83 | */ |
| 85 | - function set_template() |
|
| 86 | - { |
|
| 84 | + function set_template() { |
|
| 87 | 85 | global $user; |
| 88 | 86 | |
| 89 | 87 | if (file_exists($this->rootPhysical. 'styles/' . $user->theme['template_path'] . '/template')) |
@@ -108,8 +106,7 @@ discard block |
||
| 108 | 106 | { |
| 109 | 107 | $this->inherit_root = $this->rootPhysical . 'styles/' . $user->theme['template_inherit_path'] . '/template'; |
| 110 | 108 | } |
| 111 | - } |
|
| 112 | - else |
|
| 109 | + } else |
|
| 113 | 110 | { |
| 114 | 111 | trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR); |
| 115 | 112 | } |
@@ -123,8 +120,7 @@ discard block |
||
| 123 | 120 | * Set custom template location (able to use directory outside of phpBB) |
| 124 | 121 | * @access public |
| 125 | 122 | */ |
| 126 | - function set_custom_template($template_path, $template_name, $fallback_template_path = false) |
|
| 127 | - { |
|
| 123 | + function set_custom_template($template_path, $template_name, $fallback_template_path = false) { |
|
| 128 | 124 | global $user; |
| 129 | 125 | |
| 130 | 126 | // Make sure $template_path has no ending slash |
@@ -145,8 +141,7 @@ discard block |
||
| 145 | 141 | |
| 146 | 142 | $this->inherit_root = $fallback_template_path; |
| 147 | 143 | $this->orig_tpl_inherits_id = true; |
| 148 | - } |
|
| 149 | - else |
|
| 144 | + } else |
|
| 150 | 145 | { |
| 151 | 146 | $this->orig_tpl_inherits_id = false; |
| 152 | 147 | } |
@@ -165,8 +160,7 @@ discard block |
||
| 165 | 160 | * should be a hash of handle => filename pairs. |
| 166 | 161 | * @access public |
| 167 | 162 | */ |
| 168 | - function set_filenames($filename_array) |
|
| 169 | - { |
|
| 163 | + function set_filenames($filename_array) { |
|
| 170 | 164 | if (!is_array($filename_array)) |
| 171 | 165 | { |
| 172 | 166 | return false; |
@@ -194,8 +188,7 @@ discard block |
||
| 194 | 188 | * Destroy template data set |
| 195 | 189 | * @access public |
| 196 | 190 | */ |
| 197 | - function destroy() |
|
| 198 | - { |
|
| 191 | + function destroy() { |
|
| 199 | 192 | $this->_tpldata = array('.' => array(0 => array())); |
| 200 | 193 | $this->_rootref = &$this->_tpldata['.'][0]; |
| 201 | 194 | } |
@@ -204,8 +197,7 @@ discard block |
||
| 204 | 197 | * Reset/empty complete block |
| 205 | 198 | * @access public |
| 206 | 199 | */ |
| 207 | - function destroy_block_vars($blockname) |
|
| 208 | - { |
|
| 200 | + function destroy_block_vars($blockname) { |
|
| 209 | 201 | if (strpos($blockname, '.') !== false) |
| 210 | 202 | { |
| 211 | 203 | // Nested block. |
@@ -220,8 +212,7 @@ discard block |
||
| 220 | 212 | } |
| 221 | 213 | |
| 222 | 214 | unset($str[$blocks[$blockcount]]); |
| 223 | - } |
|
| 224 | - else |
|
| 215 | + } else |
|
| 225 | 216 | { |
| 226 | 217 | // Top-level block. |
| 227 | 218 | unset($this->_tpldata[$blockname]); |
@@ -234,8 +225,7 @@ discard block |
||
| 234 | 225 | * Display handle |
| 235 | 226 | * @access public |
| 236 | 227 | */ |
| 237 | - function display($handle, $include_once = true) |
|
| 238 | - { |
|
| 228 | + function display($handle, $include_once = true) { |
|
| 239 | 229 | if (defined('IN_ERROR_HANDLER')) |
| 240 | 230 | { |
| 241 | 231 | $is_enotice = error_reporting(); |
@@ -248,8 +238,7 @@ discard block |
||
| 248 | 238 | if ($filename = $this->_tpl_load($handle)) |
| 249 | 239 | { |
| 250 | 240 | ($include_once) ? include_once($filename) : include($filename); |
| 251 | - } |
|
| 252 | - else |
|
| 241 | + } else |
|
| 253 | 242 | { |
| 254 | 243 | $this->evaluate($this->compiled_code[$handle]); |
| 255 | 244 | } |
@@ -261,8 +250,7 @@ discard block |
||
| 261 | 250 | * Display the handle and assign the output to a template variable or return the compiled result. |
| 262 | 251 | * @access public |
| 263 | 252 | */ |
| 264 | - function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) |
|
| 265 | - { |
|
| 253 | + function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) { |
|
| 266 | 254 | ob_start(); |
| 267 | 255 | $this->display($handle, $include_once); |
| 268 | 256 | $contents = ob_get_clean(); |
@@ -281,8 +269,7 @@ discard block |
||
| 281 | 269 | * Load a compiled template if possible, if not, recompile it |
| 282 | 270 | * @access private |
| 283 | 271 | */ |
| 284 | - function _tpl_load(&$handle) |
|
| 285 | - { |
|
| 272 | + function _tpl_load(&$handle) { |
|
| 286 | 273 | global $user, $config; |
| 287 | 274 | |
| 288 | 275 | if (!isset($this->filename[$handle])) |
@@ -303,8 +290,7 @@ discard block |
||
| 303 | 290 | if (!file_exists($filename) || @filesize($filename) === 0) |
| 304 | 291 | { |
| 305 | 292 | $recompile = true; |
| 306 | - } |
|
| 307 | - else if ($config->load_tplcompile) |
|
| 293 | + } else if ($config->load_tplcompile) |
|
| 308 | 294 | { |
| 309 | 295 | // No way around it: we need to check inheritance here |
| 310 | 296 | if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle])) |
@@ -387,15 +373,13 @@ discard block |
||
| 387 | 373 | $this->files[$row['template_filename']] = $file; |
| 388 | 374 | $this->files_inherit[$row['template_filename']] = $file; |
| 389 | 375 | $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id']; |
| 390 | - } |
|
| 391 | - else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) |
|
| 376 | + } else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) |
|
| 392 | 377 | { |
| 393 | 378 | // Ok, we have a situation. There is a file in the subtemplate, but nothing in the DB. We have to fix that. |
| 394 | 379 | $force_reload = true; |
| 395 | 380 | $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id']; |
| 396 | 381 | } |
| 397 | - } |
|
| 398 | - else |
|
| 382 | + } else |
|
| 399 | 383 | { |
| 400 | 384 | $this->files_template[$row['template_filename']] = $user->theme['template_id']; |
| 401 | 385 | } |
@@ -405,8 +389,7 @@ discard block |
||
| 405 | 389 | if ($row['template_filename'] == $this->filename[$handle]) |
| 406 | 390 | { |
| 407 | 391 | $compile->_tpl_load_file($handle, true); |
| 408 | - } |
|
| 409 | - else |
|
| 392 | + } else |
|
| 410 | 393 | { |
| 411 | 394 | $this->files[$row['template_filename']] = $file; |
| 412 | 395 | $this->filename[$row['template_filename']] = $row['template_filename']; |
@@ -421,8 +404,7 @@ discard block |
||
| 421 | 404 | { |
| 422 | 405 | $this->compiled_code[$handle] = $compile->compile(trim($row['template_data'])); |
| 423 | 406 | $compile->compile_write($handle, $this->compiled_code[$handle]); |
| 424 | - } |
|
| 425 | - else |
|
| 407 | + } else |
|
| 426 | 408 | { |
| 427 | 409 | // Only bother compiling if it doesn't already exist |
| 428 | 410 | if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX)) |
@@ -433,8 +415,7 @@ discard block |
||
| 433 | 415 | } |
| 434 | 416 | } |
| 435 | 417 | } |
| 436 | - } |
|
| 437 | - else |
|
| 418 | + } else |
|
| 438 | 419 | { |
| 439 | 420 | $file = $this->root . '/' . $row['template_filename']; |
| 440 | 421 | |
@@ -461,8 +442,7 @@ discard block |
||
| 461 | 442 | * Assign key variable pairs from an array |
| 462 | 443 | * @access public |
| 463 | 444 | */ |
| 464 | - function assign_vars($vararray) |
|
| 465 | - { |
|
| 445 | + function assign_vars($vararray) { |
|
| 466 | 446 | foreach ($vararray as $key => $val) |
| 467 | 447 | { |
| 468 | 448 | $this->_rootref[$key] = $val; |
@@ -475,8 +455,7 @@ discard block |
||
| 475 | 455 | * Assign a single variable to a single key |
| 476 | 456 | * @access public |
| 477 | 457 | */ |
| 478 | - function assign_var($varname, $varval) |
|
| 479 | - { |
|
| 458 | + function assign_var($varname, $varval) { |
|
| 480 | 459 | $this->_rootref[$varname] = $varval; |
| 481 | 460 | |
| 482 | 461 | return true; |
@@ -486,8 +465,7 @@ discard block |
||
| 486 | 465 | * Assign key variable pairs from an array to a specified block |
| 487 | 466 | * @access public |
| 488 | 467 | */ |
| 489 | - function assign_block_vars($blockname, $vararray) |
|
| 490 | - { |
|
| 468 | + function assign_block_vars($blockname, $vararray) { |
|
| 491 | 469 | if (strpos($blockname, '.') !== false) |
| 492 | 470 | { |
| 493 | 471 | // Nested block. |
@@ -522,8 +500,7 @@ discard block |
||
| 522 | 500 | // We're adding a new iteration to this block with the given |
| 523 | 501 | // variable assignments. |
| 524 | 502 | $str[$blocks[$blockcount]][] = $vararray; |
| 525 | - } |
|
| 526 | - else |
|
| 503 | + } else |
|
| 527 | 504 | { |
| 528 | 505 | // Top-level block. |
| 529 | 506 | $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0; |
@@ -577,8 +554,7 @@ discard block |
||
| 577 | 554 | * @return bool false on error, true on success |
| 578 | 555 | * @access public |
| 579 | 556 | */ |
| 580 | - function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') |
|
| 581 | - { |
|
| 557 | + function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') { |
|
| 582 | 558 | if (strpos($blockname, '.') !== false) |
| 583 | 559 | { |
| 584 | 560 | // Nested blocks are not supported |
@@ -623,8 +599,7 @@ discard block |
||
| 623 | 599 | $key = sizeof($this->_tpldata[$blockname]); |
| 624 | 600 | unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']); |
| 625 | 601 | $vararray['S_LAST_ROW'] = true; |
| 626 | - } |
|
| 627 | - else if ($key === 0) |
|
| 602 | + } else if ($key === 0) |
|
| 628 | 603 | { |
| 629 | 604 | unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']); |
| 630 | 605 | $vararray['S_FIRST_ROW'] = true; |
@@ -663,8 +638,7 @@ discard block |
||
| 663 | 638 | * Include a separate template |
| 664 | 639 | * @access private |
| 665 | 640 | */ |
| 666 | - function _tpl_include($filename, $include = true) |
|
| 667 | - { |
|
| 641 | + function _tpl_include($filename, $include = true) { |
|
| 668 | 642 | // This is used to access global vars |
| 669 | 643 | // global $lang, $config, $user; // Not needed! |
| 670 | 644 | |
@@ -694,8 +668,7 @@ discard block |
||
| 694 | 668 | * Include a php-file |
| 695 | 669 | * @access private |
| 696 | 670 | */ |
| 697 | - function _php_include($filename) |
|
| 698 | - { |
|
| 671 | + function _php_include($filename) { |
|
| 699 | 672 | $file = $this->rootPhysical . $filename; |
| 700 | 673 | |
| 701 | 674 | if (!file_exists($file)) |
@@ -711,8 +684,7 @@ discard block |
||
| 711 | 684 | * Assign key variable pairs from an array with block support |
| 712 | 685 | * @access public |
| 713 | 686 | */ |
| 714 | - function assign_recursive($values, $name = '') |
|
| 715 | - { |
|
| 687 | + function assign_recursive($values, $name = '') { |
|
| 716 | 688 | if(isset($values['.'])) |
| 717 | 689 | { |
| 718 | 690 | $values_extra = $values['.']; |
@@ -722,8 +694,7 @@ discard block |
||
| 722 | 694 | if(!$name) |
| 723 | 695 | { |
| 724 | 696 | $this->assign_vars($values); |
| 725 | - } |
|
| 726 | - else |
|
| 697 | + } else |
|
| 727 | 698 | { |
| 728 | 699 | $this->assign_block_vars($name, $values); |
| 729 | 700 | } |