supernova-ws / SuperNova

includes/includes/user_birthday_celebrate.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
   $query = db_user_list_to_celebrate($config->user_birthday_range);
 
-  while($row = db_fetch($query))
+  while ($row = db_fetch($query))
   {
     $row['username'] = db_escape($row['username']);
     rpg_points_change($row['id'], RPG_BIRTHDAY, $config->user_birthday_gift, "Birthday gift for user {$row['username']} ID {$row['id']} on his birthday on {$row['user_birthday']}. Gift last gaved at {$row['user_birthday_celebrated']}");

includes/includes/flt_page1.inc

Spacing +14 added lines, -14 removed lines

@@ -4,18 +4,18 @@ 
 // @version 1.0
 // @copyright 2008 by Chlorel for XNova
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('fleet1', true);
 
 $ships = sys_get_param('ships', array());
-if(!is_array($ships)) {
+if (!is_array($ships)) {
   $ships = array();
 }
 
-foreach(array(PT_PLANET, PT_DEBRIS, PT_MOON) as $possible_planet_type_id) {
+foreach (array(PT_PLANET, PT_DEBRIS, PT_MOON) as $possible_planet_type_id) {
   $template->assign_block_vars('possible_planet_type_id', array(
     'ID' => $possible_planet_type_id,
     'NAME' => $lang['sys_planet_type_sh'][$possible_planet_type_id],
@@ -28,7 +28,7 @@ 
   'START_NAME'         => $planetrow['name'],
 );
 
-if(!empty($TargetPlanet)) {
+if (!empty($TargetPlanet)) {
   $template_route += array(
     'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
     'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -39,10 +39,10 @@ 
 $template->assign_block_vars('fleets', $template_route);
 
 $sn_groups_fleet = sn_get_groups('fleet');
-foreach($ships as $ship_id => $ship_count) {
-  if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+foreach ($ships as $ship_id => $ship_count) {
+  if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
     $ship_info = get_unit_param($ship_id);
-    if($ship_count > mrc_get_level($user, $planetrow, $ship_id, false, true)) {
+    if ($ship_count > mrc_get_level($user, $planetrow, $ship_id, false, true)) {
       $page .= $lang['fl_noenought'];
     } else {
       $fleet['fleetarray'][$ship_id]  = $ship_count;
@@ -61,13 +61,13 @@ 
   }
 }
 
-if(empty($fleet['fleetarray'])) {
+if (empty($fleet['fleetarray'])) {
   message($lang['fl_err_no_ships'], $lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
 }
 
 // Building list of shortcuts
 $query = doquery("SELECT * FROM {{notes}} WHERE `owner` = {$user['id']} AND `galaxy` <> 0 AND `system` <> 0 AND `planet` <> 0 ORDER BY `priority` DESC, `galaxy`, `system`, `planet`, `planet_type`;");
-while($shortcut = db_fetch($query)) {
+while ($shortcut = db_fetch($query)) {
   $template->assign_block_vars('shortcut', array(
     'NAME'       => $shortcut['title'],
     'GALAXY'     => $shortcut['galaxy'],
@@ -81,10 +81,10 @@ 
 }
 
 // Building list of own planets & moons
-$colonies = db_planet_list_sorted ( $user );
-if(count($colonies) > 1) {
+$colonies = db_planet_list_sorted($user);
+if (count($colonies) > 1) {
   // while($row = db_fetch($colonies))
-  foreach($colonies as $row) {
+  foreach ($colonies as $row) {
     $template->assign_block_vars('colonies', array(
       'NAME'       => $row['name'],
       'GALAXY'     => $row['galaxy'],
@@ -99,9 +99,9 @@ 
 //ACS Start
 //Need to look for acs attacks.
 $aks_madnessred = doquery('SELECT * FROM {{aks}};');
-while($row = db_fetch($aks_madnessred)) {
+while ($row = db_fetch($aks_madnessred)) {
   $members = explode(',', $row['eingeladen']);
-  foreach($members as $a => $b) {
+  foreach ($members as $a => $b) {
     if ($b == $user['id']) {
       $template->assign_block_vars('acss', array(
         'ID'         => $row['id'],

includes/includes/ube_zi_helpers.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
   print($round);
   print('<table border=1>');
   print('<tr align="left">');
-  foreach($header as $key => $value)
+  foreach ($header as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }
@@ -61,9 +61,9 @@ 
   );
 
   print('<tr align="right">');
-  foreach($debug_unit_crossfire_result as $key => $value)
+  foreach ($debug_unit_crossfire_result as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }

includes/includes/sys_avatar.php

Spacing +9 added lines, -9 removed lines

@@ -9,28 +9,28 @@ 
     $avatar_filename = $fullsize_filename = SN_ROOT_PHYSICAL . 'images/avatar/' . $prefix . '_' . $subject_id;
     $avatar_filename .= '.png';
     $fullsize_filename .= '_full.png';
-    if(sys_get_param_int('avatar_remove'))
+    if (sys_get_param_int('avatar_remove'))
     {
-      if(file_exists($avatar_filename) && !unlink($avatar_filename))
+      if (file_exists($avatar_filename) && !unlink($avatar_filename))
       {
         throw new Exception($lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
     }
-    elseif($_FILES['avatar']['size'])
+    elseif ($_FILES['avatar']['size'])
     {
-      if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
+      if (!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
         throw new Exception($lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
 
-      if($_FILES['avatar']['error'])
+      if ($_FILES['avatar']['error'])
       {
         throw new Exception(sprintf($lang['opt_msg_avatar_error_upload'], $_FILES['avatar']['error']), ERR_ERROR);
       }
 
-      if(!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name']))))
+      if (!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name']))))
       {
         throw new Exception($lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
@@ -38,7 +38,7 @@ 
       $avatar_size = getimagesize($_FILES['avatar']['tmp_name']);
       $avatar_max_width  = $config-> avatar_max_width;
       $avatar_max_height = $config-> avatar_max_height;
-      if($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height)
+      if ($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height)
       {
         $aspect_ratio = min($avatar_max_width / $avatar_size[0], $avatar_max_height / $avatar_size[1]);
         $avatar_image_new = imagecreatetruecolor($avatar_size[0] * $aspect_ratio, $avatar_size[0] * $aspect_ratio);
@@ -47,12 +47,12 @@ 
         $avatar_image = $avatar_image_new;
       }
 
-      if(file_exists($avatar_filename) && !unlink($avatar_filename))
+      if (file_exists($avatar_filename) && !unlink($avatar_filename))
       {
         throw new Exception($lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
 
-      if(!imagepng($avatar_image, $avatar_filename, 9))
+      if (!imagepng($avatar_image, $avatar_filename, 9))
       {
         throw new Exception($lang['opt_msg_avatar_error_writing'], ERR_ERROR);
       }

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
-    }
-    elseif($_FILES['avatar']['size'])
+    } elseif($_FILES['avatar']['size'])
     {
       if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
@@ -61,8 +60,7 @@ 
       imagedestroy($avatar_image);
       throw new Exception($lang['opt_msg_avatar_uploaded'], ERR_NONE);
     }
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     return array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

includes/classes/RequestInfo.php

Spacing +9 added lines, -9 removed lines

@@ -89,15 +89,15 @@ 
     // Инфа об устройстве и браузере - общая для всех
     sn_db_transaction_start();
     $this->device_cypher = $_COOKIE[SN_COOKIE_D];
-    if($this->device_cypher) {
+    if ($this->device_cypher) {
       $cypher_safe = db_escape($this->device_cypher);
       $device_id = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
-      if(!empty($device_id['device_id'])) {
+      if (!empty($device_id['device_id'])) {
         $this->device_id = $device_id['device_id'];
       }
     }
 
-    if($this->device_id <= 0) {
+    if ($this->device_id <= 0) {
       do {
         $cypher_safe = db_escape($this->device_cypher = sys_random_string());
         $row = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
@@ -118,10 +118,10 @@ 
     $this->page_address_id = db_get_set_unique_id_value($this->page_address, 'url_id', 'security_url', 'url_string');
     sn_db_transaction_commit();
 
-    if($this->write_full_url) {
+    if ($this->write_full_url) {
       sn_db_transaction_start();
       $this->page_url = substr($_SERVER['REQUEST_URI'], strlen(SN_ROOT_RELATIVE));
-      if(strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
+      if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
         $this->page_url = '/simulator.php';
       }
       $this->page_url_id = db_get_set_unique_id_value($this->page_url, 'url_id', 'security_url', 'url_string');
@@ -144,7 +144,7 @@ 
    */
   public function db_security_entry_insert($user_id_unsafe) {
     // TODO $user_id = !empty(self::$user['id']) ? self::$user['id'] : 'NULL';
-    if(empty($user_id_unsafe)) {
+    if (empty($user_id_unsafe)) {
       // self::flog('Нет ИД пользователя');
       return true;
     }
@@ -167,7 +167,7 @@ 
   public function db_counter_insert($user_id_unsafe) {
     global $config, $sys_stop_log_hit, $is_watching;
 
-    if($sys_stop_log_hit || !$config->game_counter) {
+    if ($sys_stop_log_hit || !$config->game_counter) {
       return;
     }
 
@@ -183,14 +183,14 @@ 
 //      $this->ip_v4_int . ", '{$proxy_safe}', " . $this->page_address_id . ", " . $this->page_url_id . ");");
     doquery(
       "INSERT INTO {{counter}} SET
-        `visit_time` = '" . SN_TIME_SQL. "',
+        `visit_time` = '" . SN_TIME_SQL . "',
         `user_id` = {$user_id_safe},
         `device_id` = {$this->device_id},
         `browser_id` = {$this->browser_id},
         `user_ip` = {$this->ip_v4_int},
         `user_proxy` = '{$proxy_safe}',
         `page_url_id` = {$this->page_address_id}" .
-        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '' ).
+        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '') .
       ";");
 
     $is_watching = false;

includes/classes/core_classes.php

Spacing +13 added lines, -13 removed lines

@@ -38,8 +38,8 @@ 
     !is_array($offset) ? $offset = array($offset) : false;
 
     $current_leaf = $this->__get(reset($offset));
-    while(($leaf_index = next($offset)) !== false) {
-      if(!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
+    while (($leaf_index = next($offset)) !== false) {
+      if (!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
         unset($current_leaf);
         break;
       }
@@ -64,9 +64,9 @@ 
 
     !is_array($offset) ? $offset = array($offset) : false;
 
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
       $result = $this->__get(reset($offset));
-      while(($leaf_index = next($offset)) !== false) {
+      while (($leaf_index = next($offset)) !== false) {
         $result = $result[$leaf_index];
       }
     }
@@ -91,12 +91,12 @@ 
    */
   public function offsetSet($offset, $value = null) {
     // Если нет никакого индекса - значит нечего записывать
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($offset) && count($offset) == 1) {
+    if (is_array($offset) && count($offset) == 1) {
       // Разворачиваем его в индекс
       $offset = array(reset($offset) => $value);
       unset($value);
@@ -104,20 +104,20 @@ 
     }
 
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($offset) && isset($value)) {
+    if (is_array($offset) && isset($value)) {
       // TODO - а не переделать ли это всё на __isset() ??
 //pdump($offset, '$offset');
 //pdump($value, '$value');
       // Вытаскиваем корневой элемент
       $root = $this->__get(reset($offset));
       $current_leaf = &$root;
-      while(($leaf_index = next($offset)) !== false) {
+      while (($leaf_index = next($offset)) !== false) {
         !is_array($current_leaf[$leaf_index]) ? $current_leaf[$leaf_index] = array() : false;
         $current_leaf = &$current_leaf[$leaf_index];
       }
 //pdump($current_leaf, '$current_leaf');
 //pdump($value, '$value');
-      if($current_leaf != $value) {
+      if ($current_leaf != $value) {
         $current_leaf = $value;
 //pdump(reset($offset), 'reset($offset)');
 //pdump($root, '$root');
@@ -128,7 +128,7 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($offset) ? $offset = array($offset => $value) : false;
 
-      foreach($offset as $key => $value) {
+      foreach ($offset as $key => $value) {
         $this->__get($key) !== $value ? $this->__set($key, $value) : false;
       }
     }
@@ -149,13 +149,13 @@ 
    */
   public function offsetUnset($offset) {
     // Если нет никакого индекса - значит нечего записывать
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
       return;
     }
 
     !is_array($offset) ? $offset = array($offset) : false;
 
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
 //pdump($offset);
       // Перематываем массив в конец
       $key_to_delete = end($offset);
@@ -163,7 +163,7 @@ 
 //pdump($key_to_delete, '$key_to_delete');
       $parent_offset = $offset;
       array_pop($parent_offset);
-      if(!count($parent_offset)) {
+      if (!count($parent_offset)) {
         // В массиве был один элемент - мы удаляем в корне. Просто удаляем элемент
         $this->__unset($key_to_delete);
       } else {

includes/classes/PlayerToAccountTranslate.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
   protected static $is_init = false;
 
   protected static function init() {
-    if(!empty(static::$db)) {
+    if (!empty(static::$db)) {
       return;
     }
     static::$db = classSupernova::$db;
@@ -66,12 +66,12 @@ 
     $provider_id_safe = intval($provider_id_unsafe);
     !is_array($account_list) ? $account_list = array($account_list) : false;
 
-    foreach($account_list as $provider_account_id_unsafe) {
+    foreach ($account_list as $provider_account_id_unsafe) {
       $provider_account_id_safe = intval($provider_account_id_unsafe);
 
       // TODO - Здесь могут отсутствовать аккаунты - проверять провайдером
       $query = static::$db->doquery("SELECT `user_id` FROM {{account_translate}} WHERE `provider_id` = {$provider_id_safe} AND `provider_account_id` = {$provider_account_id_safe} FOR UPDATE");
-      while($row = static::$db->db_fetch($query)) {
+      while ($row = static::$db->db_fetch($query)) {
         $account_translation[$row['user_id']][$provider_id_unsafe][$provider_account_id_unsafe] = true;
       }
     }
@@ -91,7 +91,7 @@ 
       "SELECT * FROM {{account_translate}} WHERE `user_id` = {$user_id_safe} " .
       ($provider_id_unsafe ? "AND `provider_id` = {$provider_id_safe} " : '') .
       "ORDER BY `timestamp` FOR UPDATE");
-    while($row = static::$db->db_fetch($query)) {
+    while ($row = static::$db->db_fetch($query)) {
       $account_translation[$row['user_id']][$row['provider_id']][$row['provider_account_id']] = $row;
     }
 

includes/classes/auth_abstract.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
    */
   // OK 4.9
   public function __construct($filename = __FILE__) {
-    if($this->provider_id == ACCOUNT_PROVIDER_NONE) {
+    if ($this->provider_id == ACCOUNT_PROVIDER_NONE) {
       die('У всех провайдеров должен быть $provider_id!');
     }
 
@@ -133,7 +133,7 @@ 
   // OK 4.6
   public function player_name_suggest() {
     $name = '';
-    if(is_object($this->account) && !empty($this->account->account_email)) {
+    if (is_object($this->account) && !empty($this->account->account_email)) {
       list($name) = explode('@', $this->account->account_email);
     }
 

includes/classes/skin.php

Spacing +18 added lines, -18 removed lines

@@ -152,7 +152,7 @@ 
    * Инициализация харнилища скинов
    */
   protected static function init() {
-    if(static::$is_init) {
+    if (static::$is_init) {
       return;
     }
 
@@ -165,7 +165,7 @@ 
 
     // Загружены ли уже данные по текущему скину?
 //pdump(static::$skin_list[$ini_path], 'static');
-    if(empty(static::$skin_list[$skin_path])) {
+    if (empty(static::$skin_list[$skin_path])) {
       // Прогружаем текущий скин
       static::$skin_list[$skin_path] = new skin($skin_path);
       static::$active = static::$skin_list[$skin_path];
@@ -201,22 +201,22 @@ 
 
     $this->is_ini_present = false;
     // Проверка на корректность и существование пути
-    if(is_file($this->root_physical_absolute . 'skin.ini')) {
+    if (is_file($this->root_physical_absolute . 'skin.ini')) {
       // Пытаемся распарсить файл
 
       // По секциям? images и config? Что бы не копировать конфигурацию? Или просто unset(__inherit) а затем заново записать
       $this->config = parse_ini_file($this->root_physical_absolute . 'skin.ini');
-      if(!empty($this->config)) {
+      if (!empty($this->config)) {
 
         $this->is_ini_present = true;
 
-        if(!empty($this->config['_inherit'])) {
+        if (!empty($this->config['_inherit'])) {
           // Если скин наследует себя...
-          if($this->config['_inherit'] == $skin_path) {
+          if ($this->config['_inherit'] == $skin_path) {
             // TODO - определять более сложные случаи циклических ссылок в _inherit
             die('">circular skin inheritance!');
           }
-          if(empty(static::$skin_list[$this->config['_inherit']])) {
+          if (empty(static::$skin_list[$this->config['_inherit']])) {
             static::$skin_list[$this->config['_inherit']] = new skin($this->config['_inherit']);
           }
           $this->parent = static::$skin_list[$this->config['_inherit']];
@@ -232,12 +232,12 @@ 
     }
 
     // Пытаемся скомпилировать _no_image заранее
-    if(!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
+    if (!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = $this->compile_try_path(SKIN_IMAGE_MISSED_FIELD, $this->config[SKIN_IMAGE_MISSED_FIELD]);
     }
 
     // Если нет заглушки
-    if(empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
+    if (empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = empty($this->parent)
         // Если нет парента - берем хардкод
         ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL . SKIN_IMAGE_MISSED_FILE_PATH
@@ -267,7 +267,7 @@ 
     $image_tag = $this->image_tag_parse($image_tag, $template);
 
     // Проверяем наличие ключа RIT в хранилища. В нём не может быть несуществующих файлов по построению
-    if(!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
+    if (!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
       return $this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]];
     }
 
@@ -285,7 +285,7 @@ 
     // Нет - image ID не является путём к файлу. Пора обратиться к предкам за помощью...
     // Пытаемся вытащить путь из родителя и применить к нему свои параметры
     // Тащим по ID изображения, а не по ТЭГУ - мало ли что там делает с путём родитель и как преобразовывает его в строку?
-    if(empty($this->container[$image_id]) && !empty($this->parent)) {
+    if (empty($this->container[$image_id]) && !empty($this->parent)) {
       $this->container[$image_id] = $this->parent->compile_image($image_id, $template);
 
       // Если у родителя нет картинки - он вернет пустую строку. Тогда нам надо использовать заглушку - свою или родительскую
@@ -306,18 +306,18 @@ 
   protected function image_tag_parse($image_tag, $template) {
     $image_tag_ptl_resolved = $image_tag;
     // Есть переменные из темплейта ?
-    if(strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
+    if (strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
       // Что бы лишний раз не запускать регексп
       // TODO - многоуровневые вложения ?! Надо ли и где их можно применить
       preg_match_all('#(\[.+?\])#', $image_tag_ptl_resolved, $matches);
-      foreach($matches[0] as &$match) {
+      foreach ($matches[0] as &$match) {
         $var_name = str_replace(array('[', ']'), '', $match);
-        if(strpos($var_name, '.') !== false) {
+        if (strpos($var_name, '.') !== false) {
           // Вложенная переменная темплейта - на текущем уровне
           // TODO Вложенная переменная из корня через "!"
           list($block_name, $block_var) = explode('.', $var_name);
           isset($template->_block_value[$block_name][$block_var]) ? $image_tag_ptl_resolved = str_replace($match, $template->_block_value[$block_name][$block_var], $image_tag_ptl_resolved) : false;
-        } elseif(strpos($var_name, '$') !== false) {
+        } elseif (strpos($var_name, '$') !== false) {
           // Корневой DEFINE
           $define_name = substr($var_name, 1);
           isset($template->_tpldata['DEFINE']['.'][$define_name]) ? $image_tag_ptl_resolved = str_replace($match, $template->_tpldata['DEFINE']['.'][$define_name], $image_tag_ptl_resolved) : false;
@@ -328,7 +328,7 @@ 
       }
     }
 
-    if(strpos($image_tag_ptl_resolved, '|') !== false) {
+    if (strpos($image_tag_ptl_resolved, '|') !== false) {
       $params = explode('|', $image_tag_ptl_resolved);
       $image_id = $params[0];
       unset($params[0]);
@@ -392,11 +392,11 @@ 
     $image_string = $this->container[$image_tag];
 
     // Нет параметров - просто возвращаем значение по $image_name из контейнера
-    if(!empty($params) && is_array($params)) {
+    if (!empty($params) && is_array($params)) {
       // Здесь автоматически произойдёт упорядочивание параметров
 
       // Параметр 'html' - выводить изображение в виде HTML-тэга
-      if(in_array('html', $params)) {
+      if (in_array('html', $params)) {
         $image_tag = $image_tag . '|html';
         $image_string = '<img src="' . $image_string . '" />';
         $this->container[$image_tag] = $image_string;