supernova-ws / SuperNova

includes/includes/market_info.inc

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 
     sn_db_transaction_commit();
     throw new Exception($info_action, ERR_NONE);
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     sn_db_transaction_rollback();
 

includes/includes/market_trader.inc

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
     if($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
-    }
-    else {
+    } else {
       // Locking user record
       $user = db_user_by_id($user['id'], true);
     }

includes/includes/sys_avatar.php

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/functions_template.php

Braces +18 added lines, -36 removed lines

@@ -66,8 +66,7 @@ 
       {
         return;
         trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-      }
-      else
+      } else
       {
         $this->template->files[$handle] = $this->template->files_inherit[$handle];
       }
@@ -225,15 +224,13 @@ 
               $var = substr($temp, 2, -1);
               //$file = $this->template->_tpldata['DEFINE']['.'][$var];
               $temp = "\$this->_tpldata['DEFINE']['.']['$var']";
-            }
-            else
+            } else
             {
               $var = substr($temp, 1, -1);
               //$file = $this->template->_rootref[$var];
               $temp = "\$this->_rootref['$var']";
             }
-          }
-          else
+          } else
           {
             $file = $temp;
           }
@@ -381,8 +378,7 @@ 
       if ($match[2] < 0)
       {
         $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-      }
-      else
+      } else
       {
         $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
       }
@@ -390,17 +386,14 @@ 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
         $loop_end = '$_' . $tag_args . '_count';
-      }
-      else if ($match[3] >= 0)
+      } else if ($match[3] >= 0)
       {
         $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-      }
-      else //if ($match[3] < -1)
+      } else //if ($match[3] < -1)
       {
         $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
       }
-    }
-    else
+    } else
     {
       $loop_start = 0;
       $loop_end = '$_' . $tag_args . '_count';
@@ -413,8 +406,7 @@ 
     {
       // We need to implode $no_nesting times from the end...
       $block = array_slice($this->block_names, -$no_nesting);
-    }
-    else
+    } else
     {
       $block = $this->block_names;
     }
@@ -424,8 +416,7 @@ 
       // Block is not nested.
       $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
-    }
-    else
+    } else
     {
       // This block is nested.
       // Generate a namespace string for this block.
@@ -573,8 +564,7 @@ 
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
             $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-          }
-          else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
+          } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
             // Allow checking if loops are set with .loopname
             // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
@@ -590,8 +580,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -599,8 +588,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -645,8 +633,7 @@ 
 
       // Now replace the php code
       $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
-    }
-    else
+    } else
     {
       preg_match('#true|false|\.#i', $match[4], $type);
 
@@ -708,8 +695,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -722,8 +708,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -735,8 +720,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -818,12 +802,10 @@ 
         $varref .= '[$_' . $blocks[$blockcount] . '_i]';
       }
       return $varref;
-    }
-    else if ($include_last_iterator)
+    } else if ($include_last_iterator)
     {
       return '$_'. $blocks[$blockcount] . '_val';
-    }
-    else
+    } else
     {
       return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
     }

includes/classes/template.php

Braces +13 added lines, -26 removed lines

@@ -89,8 +89,7 @@ 
       {
         $this->inherit_root = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template';
       }
-    }
-    else
+    } else
     {
       trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR);
     }
@@ -126,8 +125,7 @@ 
 
       $this->inherit_root = $fallback_template_path;
       $this->orig_tpl_inherits_id = true;
-    }
-    else
+    } else
     {
       $this->orig_tpl_inherits_id = false;
     }
@@ -201,8 +199,7 @@ 
       }
 
       unset($str[$blocks[$blockcount]]);
-    }
-    else
+    } else
     {
       // Top-level block.
       unset($this->_tpldata[$blockname]);
@@ -238,8 +235,7 @@ 
     if ($filename = $this->_tpl_load($handle))
     {
       ($include_once) ? include_once($filename) : include($filename);
-    }
-    else
+    } else
     {
       eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
     }
@@ -293,8 +289,7 @@ 
     if (!file_exists($filename) || @filesize($filename) === 0)
     {
       $recompile = true;
-    }
-    else if ($config->load_tplcompile)
+    } else if ($config->load_tplcompile)
     {
       // No way around it: we need to check inheritance here
       if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle]))
@@ -382,15 +377,13 @@ 
               $this->files[$row['template_filename']] = $file;
               $this->files_inherit[$row['template_filename']] = $file;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
-            }
-            else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
+            } else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
             {
               // Ok, we have a situation. There is a file in the subtemplate, but nothing in the DB. We have to fix that.
               $force_reload = true;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
             }
-          }
-          else
+          } else
           {
             $this->files_template[$row['template_filename']] = $user->theme['template_id'];
           }
@@ -400,8 +393,7 @@ 
             if ($row['template_filename'] == $this->filename[$handle])
             {
               $compile->_tpl_load_file($handle, true);
-            }
-            else
+            } else
             {
               $this->files[$row['template_filename']] = $file;
               $this->filename[$row['template_filename']] = $row['template_filename'];
@@ -416,8 +408,7 @@ 
           {
             $this->compiled_code[$handle] = $compile->compile(trim($row['template_data']));
             $compile->compile_write($handle, $this->compiled_code[$handle]);
-          }
-          else
+          } else
           {
             // Only bother compiling if it doesn't already exist
             if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX))
@@ -428,8 +419,7 @@ 
             }
           }
         }
-      }
-      else
+      } else
       {
         $file = $this->root . '/' . $row['template_filename'];
 
@@ -517,8 +507,7 @@ 
       // We're adding a new iteration to this block with the given
       // variable assignments.
       $str[$blocks[$blockcount]][] = $vararray;
-    }
-    else
+    } else
     {
       // Top-level block.
       $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0;
@@ -618,8 +607,7 @@ 
         $key = sizeof($this->_tpldata[$blockname]);
         unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']);
         $vararray['S_LAST_ROW'] = true;
-      }
-      else if ($key === 0)
+      } else if ($key === 0)
       {
         unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']);
         $vararray['S_FIRST_ROW'] = true;
@@ -719,8 +707,7 @@ 
     if(!$name)
     {
       $this->assign_vars($values);
-    }
-    else
+    } else
     {
       $this->assign_block_vars($name, $values);
     }

includes/classes/supernova.php

Braces +79 added lines, -35 removed lines

@@ -202,14 +202,18 @@ 
   // Перепаковывает массив на заданную глубину, убирая поля с null
   public static function array_repack(&$array, $level = 0) {
     // TODO $lock_table не нужна тут
-    if(!is_array($array)) return;
+    if(!is_array($array)) {
+      return;
+    }
 
     foreach($array as $key => &$value) {
       if($value === null) {
         unset($array[$key]);
       } elseif($level > 0 && is_array($value)) {
         static::array_repack($value, $level - 1);
-        if(empty($value)) unset($array[$key]);
+        if(empty($value)) {
+          unset($array[$key]);
+        }
       }
     }
   }
@@ -218,7 +222,9 @@ 
   // TODO Вынести в отдельный объект
   public static function cache_repack($location_type, $record_id = 0) {
     // Если есть $user_id - проверяем, а надо ли перепаковывать?
-    if($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) return;
+    if($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) {
+      return;
+    }
 
     static::array_repack(static::$data[$location_type]);
     static::array_repack(static::$locator[$location_type], 3); // TODO У каждого типа локации - своя глубина!!!! Но можно и глубже ???
@@ -263,7 +269,9 @@ 
   */
   public static function cache_set($location_type, $record_id, $record, $force_overwrite = false, $skip_lock = false) {
     // нет идентификатора - выход
-    if(!($record_id = $record[static::$location_info[$location_type][P_ID]])) return;
+    if(!($record_id = $record[static::$location_info[$location_type][P_ID]])) {
+      return;
+    }
 
     $in_transaction = static::db_transaction_check(false);
     if(
@@ -297,8 +305,9 @@ 
     return static::$locks[$location_type][$record_id] = true; // Не всегда - от результата
   }
   public static function cache_lock_unset($location_type, $record_id) {
-    if(isset(static::$locks[$location_type][$record_id]))
-      unset(static::$locks[$location_type][$record_id]);
+    if(isset(static::$locks[$location_type][$record_id])) {
+          unset(static::$locks[$location_type][$record_id]);
+    }
     return true; // Не всегда - от результата
   }
   public static function cache_lock_unset_all() {
@@ -471,8 +480,9 @@ 
           //pdump($q, 'Запрос блокировки');
           while($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
-            if(!static::cache_lock_get($owner_location_type, $row['parent_id']))
-              $parent_id_list[$row['parent_id']] = $row['parent_id'];
+            if(!static::cache_lock_get($owner_location_type, $row['parent_id'])) {
+                          $parent_id_list[$row['parent_id']] = $row['parent_id'];
+            }
           }
           //pdump($parent_id_list, 'Выбраны родители');
           // Если все-таки какие-то записи еще не заблокированы - вынимаем текущие версии из базы
@@ -506,7 +516,9 @@ 
       if(is_array($query_cache)) {
         foreach($query_cache as $key => $value) {
           $result[$key] = $value;
-          if($fetch) break;
+          if($fetch) {
+            break;
+          }
         }
       }
       return $fetch ? (is_array($result) ? reset($result) : false) : $result;
@@ -515,12 +527,15 @@ 
 
   public static function db_upd_record_by_id($location_type, $record_id, $set) {
     //if(!($record_id = intval($record_id)) || !($set = trim($set))) return false;
-    if(!($record_id = idval($record_id)) || !($set = trim($set))) return false;
+    if(!($record_id = idval($record_id)) || !($set = trim($set))) {
+      return false;
+    }
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if(static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -528,6 +543,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         static::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         static::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -537,7 +553,9 @@ 
     return $result;
   }
   public static function db_upd_record_list($location_type, $condition, $set) {
-    if(!($set = trim($set))) return false;
+    if(!($set = trim($set))) {
+      return false;
+    }
 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
@@ -560,9 +578,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if($result = static::db_query("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -600,24 +620,30 @@ 
   public static function db_del_record_by_id($location_type, $safe_record_id)
   {
     // if(!($safe_record_id = intval($safe_record_id))) return false;
-    if(!($safe_record_id = idval($safe_record_id))) return false;
+    if(!($safe_record_id = idval($safe_record_id))) {
+      return false;
+    }
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
     if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         static::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
   }
   public static function db_del_record_list($location_type, $condition)
   {
-    if(!($condition = trim($condition))) return false;
+    if(!($condition = trim($condition))) {
+      return false;
+    }
 
     $location_info = &static::$location_info[$location_type];
     $table_name = $location_info[P_TABLE_NAME];
@@ -626,12 +652,14 @@ 
 
     if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE {$condition}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         // TODO - когда будет структурированный $condition можно будет делать только cache_unset по нужным записям
         static::cache_clear($location_type);
       }
+      }
     }
 
     return $result;
@@ -673,11 +701,13 @@ 
   public static function db_get_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false)
   {
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
-    if(!($username_unsafe = trim($username_unsafe))) return false;
+    if(!($username_unsafe = trim($username_unsafe))) {
+      return false;
+    }
 
     $user = null;
-    if(is_array(static::$data[LOC_USER]))
-    foreach(static::$data[LOC_USER] as $user_id => $user_data)
+    if(is_array(static::$data[LOC_USER])) {
+        foreach(static::$data[LOC_USER] as $user_id => $user_data)
     {
       if(is_array($user_data) && isset($user_data['username']))
       {
@@ -687,6 +717,7 @@ 
         {
           // $user_as_ally = intval($user_data['user_as_ally']);
           $user_as_ally = idval($user_data['user_as_ally']);
+    }
           if($player === null || ($player === true && !$user_as_ally) || ($player === false && $user_as_ally))
           {
             $user = $user_data;
@@ -714,7 +745,9 @@ 
   }
   // UNUSED
   public static function db_get_user_by_email($email_unsafe, $use_both = false, $for_update = false, $fields = '*') {
-    if(!($email_unsafe = strtolower(trim($email_unsafe)))) return false;
+    if(!($email_unsafe = strtolower(trim($email_unsafe)))) {
+      return false;
+    }
 
     $user = null;
     // TODO переделать на индексы
@@ -794,7 +827,9 @@ 
   public static function db_get_unit_list_by_location($user_id = 0, $location_type, $location_id)
   {
     //if(!($location_type = intval($location_type)) || !($location_id = intval($location_id))) return false;
-    if(!($location_type = idval($location_type)) || !($location_id = idval($location_id))) return false;
+    if(!($location_type = idval($location_type)) || !($location_id = idval($location_id))) {
+      return false;
+    }
 
     $query_cache = &static::$locator[LOC_UNIT][$location_type][$location_id];
     if(!isset($query_cache))
@@ -861,15 +896,18 @@ 
     $query = array();
 
     // if($user_id = intval($user_id))
-    if($user_id = idval($user_id))
-      $query[] = "`que_player_id` = {$user_id}";
+    if($user_id = idval($user_id)) {
+          $query[] = "`que_player_id` = {$user_id}";
+    }
 
-    if($que_type == QUE_RESEARCH || $planet_id === null)
-      $query[] = "`que_planet_id` IS NULL";
-    elseif($planet_id)
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
-    if($que_type)
-      $query[] = "`que_type` = {$que_type}";
+    if($que_type == QUE_RESEARCH || $planet_id === null) {
+          $query[] = "`que_planet_id` IS NULL";
+    } elseif($planet_id) {
+          $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+    }
+    if($que_type) {
+          $query[] = "`que_type` = {$que_type}";
+    }
 
     /*
     $sql = '';
@@ -990,8 +1028,7 @@ 
           ),
         ),
       );
-    }
-    else
+    } else
     {
       $db_changeset = array(
         'action' => SQL_OP_INSERT,
@@ -1133,7 +1170,9 @@ 
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
     $result = true;
-    if(!is_array($db_changeset) || empty($db_changeset)) return $result;
+    if(!is_array($db_changeset) || empty($db_changeset)) {
+      return $result;
+    }
 
     foreach($db_changeset as $table_name => &$table_data) {
       // TODO - delayed changeset
@@ -1147,8 +1186,13 @@ 
       foreach($table_data as $record_id => &$conditions) {
         static::db_changeset_condition_compile($conditions, $table_name);
 
-        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) continue;
-        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) continue; // Защита от случайного удаления всех данных в таблице
+        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) {
+          continue;
+        }
+        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) {
+          continue;
+        }
+        // Защита от случайного удаления всех данных в таблице
 
         if($conditions[P_LOCATION] != LOC_NONE) {
           //die('spec ops supernova.php line 928 Добавить работу с кэшем юнитов итд');

includes/update_old.php

Braces +6 added lines, -12 removed lines

@@ -197,8 +197,7 @@ 
           if($old_que_item[4] == 'build')
           {
             $old_que_item[4] = BUILD_CREATE;
-          }
-          else
+          } else
           {
             $old_que_item[4] = BUILD_DESTROY;
           }
@@ -667,18 +666,15 @@ 
             if(preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2))
             {
               $reason = RPG_MARKET;
-            }
-            elseif(preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2))
+            } elseif(preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2))
             {
               $reason = RPG_MERCENARY;
               $comment = "Spent for mercenary {$matches2[1]} GUID {$matches2[2]}";
-            }
-            elseif(preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2))
+            } elseif(preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2))
             {
               $reason = RPG_REFERRAL;
               $comment = "Incoming from referral ID {$matches[1]}";
-            }
-            elseif(preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2))
+            } elseif(preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2))
             {
               $reason = RPG_ADMIN;
               $comment = $matches2[1];
@@ -1716,8 +1712,7 @@ 
         if(!isset($found[$index]))
         {
           $found[$index] = $row['BUDDY_ID'];
-        }
-        else
+        } else
         {
           $lost[] = $row['BUDDY_ID'];
         }
@@ -2169,8 +2164,7 @@ 
               $que_data[QI_PLANET_ID] = 'NULL';
             }
           }
-        }
-        else
+        } else
         {
           $que_data[QI_PLANET_ID] = 'NULL';
         }

includes/debug.class.php

Braces +3 added lines, -1 removed lines

@@ -140,11 +140,13 @@
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
       foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
+        foreach($location as $location_id => &$location_data) {
+          //          $location_data = $location_id;
         {
           $location_data = isset($location_data['username']) ? $location_data['username'] :
             (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
+        }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }

includes/update.php

Braces +21 added lines, -9 removed lines

@@ -399,7 +399,9 @@ 
         $units_levels = array();
         foreach($planet_unit_list as $unit_id) {
           $unit_name = &$units_info[$unit_id][P_NAME];
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) continue;
+          if(!isset($row[$unit_name]) || !$row[$unit_name]) {
+            continue;
+          }
           $units_levels[$unit_id] = $row[$unit_name];
           $unit_data[] = "({$user_id}," . LOC_PLANET . ",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
           if(count($unit_data) > 30) {
@@ -413,7 +415,9 @@ 
         if($row['que']) {
           $que = explode(';', $row['que']);
           foreach($que as $que_item) {
-            if(!$que_item) continue;
+            if(!$que_item) {
+              continue;
+            }
 
             $que_item = explode(',', $que_item);
 
@@ -445,9 +449,13 @@ 
           $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0, );
           $hangar_units = sys_unit_str2arr($row['b_hangar_id']);
           foreach($hangar_units as $unit_id => $unit_count) {
-            if($unit_count <= 0) continue;
+            if($unit_count <= 0) {
+              continue;
+            }
             foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) continue;
+              if(!in_array($resource_id, $group_resource_loot)) {
+                continue;
+              }
               $return_resources[$resource_id] += $unit_count * $resource_amount;
             }
           }
@@ -464,11 +472,13 @@ 
         }
       }
 
-      if(!empty($unit_data))
-        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+      if(!empty($unit_data)) {
+              upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+      }
 
-      if(!empty($que_data))
-        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
+      if(!empty($que_data)) {
+              upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
+      }
 
       upd_alter_table('planets', $drop, true);
     }
@@ -761,9 +771,11 @@ 
         !empty($strings) ? doquery($query_string . implode(',', $strings)) : false;
       }
 
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
+      if(isset($update_tables['counter']['page'])) {
+        // TODO REMOVE
       {
         update_security_url("SELECT DISTINCT `page` as url FROM {{counter}}");
+      }
         update_security_url("SELECT DISTINCT `url` as url FROM {{counter}}");
       }
     }