supernova-ws / SuperNova

includes/classes/db_mysql_v5.php

Spacing +3 added lines, -3 removed lines

@@ -30,11 +30,11 @@ 
 
     static $need_keys = array('server', 'user', 'pass', 'name', 'prefix');
 
-    if($this->connected) {
+    if ($this->connected) {
       return true;
     }
 
-    if(empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
+    if (empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
       $debug->error_fatal('There is missconfiguration in your config.php. Check it again');
     }
 
@@ -90,7 +90,7 @@ 
     return mysqli_real_escape_string($this->link, $unescaped_string);
   }
   function mysql_close_link() {
-    if(is_object($this->link)) {
+    if (is_object($this->link)) {
       $this->link->close();
       $this->connected = false;
       unset($this->link);

includes/classes/db_mysql.php

Doc Comments +10 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    *
    * @return mixed
    */
@@ -140,8 +140,8 @@ 
   }
 
   /**
-   * @param       $query
-   * @param       $fetch
+   * @param       string $query
+   * @param       boolean $fetch
    */
   public function logQuery($query, $fetch) {
     if(!classSupernova::$config->debug) {
@@ -204,6 +204,10 @@ 
 
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   function security_watch_user_queries($query) {
     global $user;
 
@@ -227,6 +231,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 

Spacing +25 added lines, -25 removed lines

@@ -73,23 +73,23 @@ 
   function sn_db_connect($external_db_settings = null) {
     $this->db_disconnect();
 
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
       $this->dbsettings = $external_db_settings;
     }
 
-    if(empty($this->dbsettings)) {
+    if (empty($this->dbsettings)) {
       $this->load_db_settings();
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
-    if(!empty($this->dbsettings)) {
+    if (!empty($this->dbsettings)) {
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
       $this->driver = new $driver_name();
       $this->db_prefix = $this->dbsettings['prefix'];
 
       $this->connected = $this->connected || $this->driver_connect();
 
-      if($this->connected) {
+      if ($this->connected) {
         $this->table_list = $this->db_get_table_list();
         // TODO Проверка на пустоту
       }
@@ -103,11 +103,11 @@ 
   function driver_connect() {
     global $debug;
 
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       $debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       $debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -115,7 +115,7 @@ 
   }
 
   function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -130,8 +130,8 @@ 
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
-      foreach($this->table_list as $tableName) {
+    if (strpos($sql, '{{') !== false) {
+      foreach ($this->table_list as $tableName) {
         $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
       }
     }
@@ -144,7 +144,7 @@ 
    * @param       $fetch
    */
   public function logQuery($query, $fetch) {
-    if(!classSupernova::$config->debug) {
+    if (!classSupernova::$config->debug) {
       return;
     }
 
@@ -162,18 +162,18 @@ 
    * @return void
    */
   public function commentQuery(&$sql) {
-    if(!defined('DEBUG_SQL_COMMENT')) {
+    if (!defined('DEBUG_SQL_COMMENT')) {
       return;
     }
     $backtrace = debug_backtrace();
     $sql_comment = classSupernova::$debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
 
     $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
-    if(defined('DEBUG_SQL_ONLINE')) {
+    if (defined('DEBUG_SQL_ONLINE')) {
       classSupernova::$debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
     }
 
-    if(defined('DEBUG_SQL_ERROR')) {
+    if (defined('DEBUG_SQL_ERROR')) {
       array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
       classSupernova::$debug->add_to_array($sql_comment);
     }
@@ -182,11 +182,11 @@ 
   }
 
   public function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -207,7 +207,7 @@ 
   function security_watch_user_queries($query) {
     global $user;
 
-    if(
+    if (
       !$this->isWatching // Not already watching
       && !empty(classSupernova::$config->game_watchlist_array) // There is some players in watchlist
       && in_array($user['id'], classSupernova::$config->game_watchlist_array) // Current player is in watchlist
@@ -215,10 +215,10 @@ 
     ) {
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
-      if(!empty($_POST)) {
+      if (!empty($_POST)) {
         $msg .= "\n\r" . dump($_POST, '$_POST');
       }
-      if(!empty($_GET)) {
+      if (!empty($_GET)) {
         $msg .= "\n\r" . dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
@@ -230,7 +230,7 @@ 
   function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -292,11 +292,11 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
-      foreach($row as $table_name) {
-        if(strpos($table_name, $this->db_prefix) === 0) {
+    while ($row = $this->db_fetch($query)) {
+      foreach ($row as $table_name) {
+        if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
-        } elseif($prefixed_only) {
+        } elseif ($prefixed_only) {
           continue;
         }
         // $table_name = str_replace($db_prefix, '', $table_name);
@@ -399,7 +399,7 @@ 
     $result = array();
 
     $status = explode('  ', $this->driver->mysql_stat());
-    foreach($status as $value) {
+    foreach ($status as $value) {
       $row = explode(': ', $value);
       $result[$row[0]] = $row[1];
     }
@@ -411,7 +411,7 @@ 
     $result = array();
 
     $query = doquery('SHOW STATUS;');
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['Variable_name']] = $row['Value'];
     }
 

tests/TestDBRow.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
   /**
    * Является ли запись пустой - т.е. при исполнении _dbSave должен быть удалён
    *
-   * @return bool
+   * @return boolean|null
    */
   public function isEmpty() {
     // TODO: Implement isEmpty() method.

includes/init_secondary.php

Spacing +18 added lines, -18 removed lines

@@ -2,19 +2,19 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
   include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX);
 }
 
-if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
+if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
   require_once(SN_ROOT_PHYSICAL . "includes/includes/user_birthday_celebrate" . DOT_PHP_EX);
   sn_user_birthday_celebrate();
 }
 
-if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
   classSupernova::$config->db_saveItem('var_online_user_count', db_user_count(true));
   classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if(classSupernova::$config->server_log_online) {
+  if (classSupernova::$config->server_log_online) {
     db_log_online_insert();
   }
 }
@@ -41,7 +41,7 @@ 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 //pdump($template_result[F_ACCOUNT_IS_AUTHORIZED]);die();
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -54,15 +54,15 @@ 
     : false
   );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-  $prohibited_characters = array_map(function ($value) {
+if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+  $prohibited_characters = array_map(function($value) {
     return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
   }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
   $template_result[F_LOGIN_MESSAGE] .= implode(', ', $prohibited_characters);
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump("Отключи отладку перед продакшном!");
 }
 
@@ -76,17 +76,17 @@ 
   ? define('INSTALL_MODE', GAME_DISABLE_INSTALL)
   : false;
 
-if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = sys_bbcodeParse(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : classLocale::$lang['sys_game_disable_reason'][classSupernova::$config->game_disable]
   );
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -100,8 +100,8 @@ 
 
 // TODO ban
 // TODO $skip_ban_check
-if($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
-  if(defined('IN_API')) {
+if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
+  if (defined('IN_API')) {
     return;
   }
 
@@ -119,13 +119,13 @@ 
 // pdump($allow_anonymous, '$allow_anonymous');
 // pdump($sys_user_logged_in, '$sys_user_logged_in');
 
-if($sys_user_logged_in && INITIAL_PAGE == 'login') {
+if ($sys_user_logged_in && INITIAL_PAGE == 'login') {
   sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
 //  pdump($sn_page_name);
 //  pdump(INITIAL_PAGE);
 //  die('{Тут должна быть ваша реклама. Точнее - ввод имени игрока}');
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   // sn_setcookie(SN_COOKIE, '', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
@@ -146,7 +146,7 @@ 
 
 global $skip_fleet_update;
 $skip_fleet_update = $skip_fleet_update || $supernova->options['fleet_update_skip'] || defined('IN_ADMIN');
-if(
+if (
   !$skip_fleet_update
   && !(defined('IN_AJAX') && IN_AJAX === true)
   && SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_last) > classSupernova::$config->fleet_update_interval
@@ -155,7 +155,7 @@ 
   flt_flying_fleet_handler($skip_fleet_update);
 }
 
-if(!defined('IN_AJAX')) {
+if (!defined('IN_AJAX')) {
   print("Scheduled processes is disabled<br />");
 }
 // scheduler_process();

includes/classes/DBRow.php

Spacing +35 added lines, -35 removed lines

@@ -138,14 +138,14 @@ 
 
     // If method is not getter or setter OR property name not exists in $_properties - raising exception
     // Descendants can catch this Exception to make own __call magic
-    if(($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
+    if (($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
       throw new ExceptionPropertyNotExists('Property ' . $propertyName . ' not exists when calling getter/setter ' . get_called_class() . '::' . $name, ERR_ERROR);
     }
 
     // TODO check for read-only
 
-    if($left3 == 'set') {
-      if(!empty($this->propertiesAdjusted[$propertyName])) {
+    if ($left3 == 'set') {
+      if (!empty($this->propertiesAdjusted[$propertyName])) {
         throw new PropertyAccessException('Property ' . $propertyName . ' already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::' . $name, ERR_ERROR);
       }
       $this->propertiesChanged[$propertyName] = 1;
@@ -154,13 +154,13 @@ 
     // Now deciding - will we call a protected setter or will we work with protected property
 
     // If method exists - just calling it
-    if(method_exists($this, $name)) {
+    if (method_exists($this, $name)) {
       return call_user_func_array(array($this, $name), $arguments);
     }
     // No getter/setter exists - works directly with protected property
 
     // Is it getter?
-    if($left3 === 'get') {
+    if ($left3 === 'get') {
       return $this->{'_' . $propertyName};
     }
 
@@ -182,7 +182,7 @@ 
    */
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
-    if($dbId <= 0) {
+    if ($dbId <= 0) {
       classSupernova::$debug->error(get_called_class() . '::dbLoad $dbId not positive = ' . $dbId);
 
       return;
@@ -191,12 +191,12 @@ 
     $this->_dbId = $dbId;
     $this->lockSkip = $lockSkip;
     // TODO - Use classSupernova::$db_records_locked
-    if(false && !$lockSkip && sn_db_transaction_check(false)) {
+    if (false && !$lockSkip && sn_db_transaction_check(false)) {
       $this->dbGetLockById($this->_dbId);
     }
 
     $db_row = doquery("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;", true);
-    if(empty($db_row)) {
+    if (empty($db_row)) {
       return;
     }
 
@@ -224,26 +224,26 @@ 
    */
   // TODO - perform operations only if properties was changed
   public function dbSave() {
-    if($this->isNew()) {
+    if ($this->isNew()) {
       // No DB_ID - new unit
-      if($this->isEmpty()) {
+      if ($this->isEmpty()) {
         classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
       }
       $this->dbInsert();
     } else {
       // DB_ID is present
-      if($this->isEmpty()) {
+      if ($this->isEmpty()) {
         $this->dbDelete();
       } else {
-        if(!sn_db_transaction_check(false)) {
+        if (!sn_db_transaction_check(false)) {
           classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
         }
         $this->dbUpdate();
       }
     }
 
-    if(!empty($this->triggerDbOperationOn)) {
-      foreach($this->triggerDbOperationOn as $item) {
+    if (!empty($this->triggerDbOperationOn)) {
+      foreach ($this->triggerDbOperationOn as $item) {
         $item->dbSave();
       }
     }
@@ -263,12 +263,12 @@ 
    */
   // TODO - protected
   public function dbInsert() {
-    if(!$this->isNew()) {
+    if (!$this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
     }
     $this->_dbId = $this->db_field_set_create($this->dbMakeFieldSet());
 
-    if(empty($this->_dbId)) {
+    if (empty($this->_dbId)) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
     }
 
@@ -281,7 +281,7 @@ 
   // TODO - protected
   public function dbUpdate() {
     // TODO - Update
-    if($this->isNew()) {
+    if ($this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldSet(true));
@@ -292,7 +292,7 @@ 
    */
   // TODO - protected
   public function dbDelete() {
-    if($this->isNew()) {
+    if ($this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
     }
     doquery("DELETE FROM {{" . static::$_table . "}} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
@@ -334,18 +334,18 @@ 
    * @param array $db_row
    */
   public function dbRowParse(array $db_row) {
-    foreach(static::$_properties as $property_name => &$property_data) {
+    foreach (static::$_properties as $property_name => &$property_data) {
       // Advanced values extraction procedure. Should be used when at least one of following rules is matched:
       // - one field should translate to several properties;
       // - one property should be filled according to several fields;
       // - property filling requires some lookup in object values;
-      if(!empty($property_data[P_METHOD_EXTRACT]) && is_callable(array($this, $property_data[P_METHOD_EXTRACT]))) {
+      if (!empty($property_data[P_METHOD_EXTRACT]) && is_callable(array($this, $property_data[P_METHOD_EXTRACT]))) {
         call_user_func_array(array($this, $property_data[P_METHOD_EXTRACT]), array(&$db_row));
         continue;
       }
 
       // If property is read-only - doing nothing
-      if(!empty($property_data[P_READ_ONLY])) {
+      if (!empty($property_data[P_READ_ONLY])) {
         continue;
       }
 
@@ -356,7 +356,7 @@ 
       !empty($property_data[P_FUNC_INPUT]) && is_callable($property_data[P_FUNC_INPUT]) ? $value = call_user_func($property_data[P_FUNC_INPUT], $value) : false;
 
       // If there is setter for this field - using it. Setters is always a methods of $THIS
-      if(!empty($property_data[P_METHOD_SET]) && is_callable(array($this, $property_data[P_METHOD_SET]))) {
+      if (!empty($property_data[P_METHOD_SET]) && is_callable(array($this, $property_data[P_METHOD_SET]))) {
         call_user_func(array($this, $property_data[P_METHOD_SET]), $value);
       } else {
         $this->{$property_name} = $value;
@@ -372,21 +372,21 @@ 
   protected function dbMakeFieldSet($isUpdate = false) {
     $array = array();
 
-    foreach(static::$_properties as $property_name => &$property_data) {
+    foreach (static::$_properties as $property_name => &$property_data) {
       // TODO - on isUpdate add only changed/adjusted properties
 
-      if(!empty($property_data[P_METHOD_INJECT]) && is_callable(array($this, $property_data[P_METHOD_INJECT]))) {
+      if (!empty($property_data[P_METHOD_INJECT]) && is_callable(array($this, $property_data[P_METHOD_INJECT]))) {
         call_user_func_array(array($this, $property_data[P_METHOD_INJECT]), array(&$array));
         continue;
       }
 
       // Skipping properties which have no corresponding field in DB
-      if(empty($property_data[P_DB_FIELD])) {
+      if (empty($property_data[P_DB_FIELD])) {
         continue;
       }
 
       // Checking - is property was adjusted or changed
-      if($isUpdate && array_key_exists($property_name, $this->propertiesAdjusted)) {
+      if ($isUpdate && array_key_exists($property_name, $this->propertiesAdjusted)) {
         // For adjusted property - take value from propertiesAdjusted array
         // TODO - differ how treated conversion to string for changed and adjusted properties
         $value = $this->propertiesAdjusted[$property_name];
@@ -416,17 +416,17 @@ 
    */
   protected function isFieldChanged($fieldName) {
     $isFieldChanged = false;
-    foreach($this->propertiesChanged as $propertyName => $cork) {
+    foreach ($this->propertiesChanged as $propertyName => $cork) {
       $propertyScheme = static::$_properties[$propertyName];
-      if(!empty($propertyScheme[P_DB_FIELDS_LINKED])) {
-        foreach($propertyScheme[P_DB_FIELDS_LINKED] as $linkedFieldName) {
-          if($linkedFieldName == $fieldName) {
+      if (!empty($propertyScheme[P_DB_FIELDS_LINKED])) {
+        foreach ($propertyScheme[P_DB_FIELDS_LINKED] as $linkedFieldName) {
+          if ($linkedFieldName == $fieldName) {
             $isFieldChanged = $propertyName;
             break 2;
           }
         }
       }
-      if(!empty($propertyScheme[P_DB_FIELD]) && $propertyScheme[P_DB_FIELD] == $fieldName) {
+      if (!empty($propertyScheme[P_DB_FIELD]) && $propertyScheme[P_DB_FIELD] == $fieldName) {
         $isFieldChanged = $propertyName;
         break;
       }
@@ -448,7 +448,7 @@ 
     $fields = implode(',', array_keys($field_set));
 
     $result = 0;
-    if(classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
+    if (classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
       $result = db_insert_id();
     }
 
@@ -466,13 +466,13 @@ 
     sn_db_field_set_safe_flag_clear($field_set);
 
     $set = array();
-    foreach($field_set as $fieldName => $value) {
-      if(!($changedProperty = $this->isFieldChanged($fieldName))) {
+    foreach ($field_set as $fieldName => $value) {
+      if (!($changedProperty = $this->isFieldChanged($fieldName))) {
         continue;
       }
 
       // TODO - separate sets from adjusts
-      if(array_key_exists($changedProperty, $this->propertiesAdjusted)) {
+      if (array_key_exists($changedProperty, $this->propertiesAdjusted)) {
         $value = "`{$fieldName}` + ($value)"; // braces for negative values
       }
 

admin/tools.php

Switch Indentation +63 added lines, -63 removed lines

@@ -34,69 +34,69 @@
 }
 
 switch($mode) {
-  case ADM_TOOL_CONFIG_RELOAD:
-    classSupernova::$config->db_loadAll();
-    sys_refresh_tablelist();
-
-    classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
-      classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
-    } else {
-      unset(classSupernova::$config->game_watchlist_array);
-    }
-  break;
-
-  case ADM_TOOL_MD5:
-    $template = gettemplate("admin/md5enc", true);
-    $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
-    $password_length = sys_get_param_int('length', 16);
-    $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
-
-    $template->assign_vars(array(
-      'SEED'   => $password_seed,
-      'LENGTH' => $password_length,
-      'STRING' => htmlentities($string),
-      'MD5'    => md5($string),
-    ));
-    display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
-  break;
-
-  case ADM_TOOL_FORCE_ALL:
-    classSupernova::$config->db_saveItem('db_version', 0);
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_FORCE_LAST:
-    classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_INFO_PHP:
-    phpinfo();
-  break;
-
-  case ADM_TOOL_INFO_SQL:
-    $template = gettemplate("simple_table", true);
-
-    $status = array(
-      classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
-      classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
-      classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
-    );
-    templateAssignTable($template, 'server', $status);
-
-    templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
-    templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
-
-    $template->assign_vars(array(
-      'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
-      'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
-      'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
-      'TABLE_FOOTER'  => 'test',
-    ));
-
-    display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
-  break;
+    case ADM_TOOL_CONFIG_RELOAD:
+      classSupernova::$config->db_loadAll();
+      sys_refresh_tablelist();
+
+      classSupernova::$config->db_loadItem('game_watchlist');
+      if(classSupernova::$config->game_watchlist) {
+        classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
+      } else {
+        unset(classSupernova::$config->game_watchlist_array);
+      }
+    break;
+
+    case ADM_TOOL_MD5:
+      $template = gettemplate("admin/md5enc", true);
+      $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
+      $password_length = sys_get_param_int('length', 16);
+      $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
+
+      $template->assign_vars(array(
+        'SEED'   => $password_seed,
+        'LENGTH' => $password_length,
+        'STRING' => htmlentities($string),
+        'MD5'    => md5($string),
+      ));
+      display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
+    break;
+
+    case ADM_TOOL_FORCE_ALL:
+      classSupernova::$config->db_saveItem('db_version', 0);
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_FORCE_LAST:
+      classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_INFO_PHP:
+      phpinfo();
+    break;
+
+    case ADM_TOOL_INFO_SQL:
+      $template = gettemplate("simple_table", true);
+
+      $status = array(
+        classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
+        classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
+        classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
+      );
+      templateAssignTable($template, 'server', $status);
+
+      templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
+      templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
+
+      $template->assign_vars(array(
+        'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
+        'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
+        'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
+        'TABLE_FOOTER'  => 'test',
+      ));
+
+      display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
+    break;
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -25,7 +25,7 @@ 
  */
 function templateAssignTable($template, $str, $status) {
   $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table'][$str]);
-  foreach($status as $key => $value) {
+  foreach ($status as $key => $value) {
     $template->assign_block_vars('table.row', array(
       'VALUE_1' => $key,
       'VALUE_2' => $value,
@@ -33,13 +33,13 @@ 
   }
 }
 
-switch($mode) {
+switch ($mode) {
   case ADM_TOOL_CONFIG_RELOAD:
     classSupernova::$config->db_loadAll();
     sys_refresh_tablelist();
 
     classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
+    if (classSupernova::$config->game_watchlist) {
       classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
     } else {
       unset(classSupernova::$config->game_watchlist_array);