supernova-ws / SuperNova

classes/DBStatic/DBStaticPlanet.php

Spacing +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
     $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
     $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
     $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);

classes/DBStatic/DBStaticUnit.php

Spacing +6 added lines, -6 removed lines

@@ -208,7 +208,7 @@ 
 
     $temp = DBStaticUnit::db_get_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
     if (!empty($temp['unit_id'])) {
-      $result = (bool)classSupernova::$gc->cacheOperator->db_upd_record_by_id(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_upd_record_by_id(
         LOC_UNIT,
         $temp['unit_id'],
         array(),
@@ -219,15 +219,15 @@ 
     } else {
       $locationIdRendered = $unit_location == LOC_USER ? $user['id'] : $planet_id;
       $unitType = get_unit_param($unit_id, P_UNIT_TYPE);
-      $result = (bool)classSupernova::$gc->cacheOperator->db_ins_record(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_ins_record(
         LOC_UNIT,
         array(
           'unit_player_id'     => $user['id'],
-          'unit_location_type' => (int)$unit_location,
+          'unit_location_type' => (int) $unit_location,
           'unit_location_id'   => $locationIdRendered,
-          'unit_type'          => (int)$unitType,
-          'unit_snid'          => (int)$unit_id,
-          'unit_level'         => (float)$unit_value,
+          'unit_type'          => (int) $unitType,
+          'unit_snid'          => (int) $unit_id,
+          'unit_level'         => (float) $unit_value,
         )
       );
     }

classes/DBStatic/DBStaticAlly.php

Spacing +5 added lines, -5 removed lines

@@ -77,12 +77,12 @@
    */
   public static function db_ally_insert($ally_name_unsafe, $ally_tag_unsafe, $userId) {
     $ally = classSupernova::$db->doInsertSet(TABLE_ALLIANCE, array(
-      'ally_name'          => (string)$ally_name_unsafe,
-      'ally_tag'           => (string)$ally_tag_unsafe,
+      'ally_name'          => (string) $ally_name_unsafe,
+      'ally_tag'           => (string) $ally_tag_unsafe,
       'ally_owner'         => $userId,
-      'ally_owner_range'   => (string)classLocale::$lang['ali_leaderRank'],
-      'ally_members'       => (int)1,
-      'ranklist'           => (string)(classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0"),
+      'ally_owner_range'   => (string) classLocale::$lang['ali_leaderRank'],
+      'ally_members'       => (int) 1,
+      'ranklist'           => (string) (classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0"),
       'ally_register_time' => SN_TIME_NOW,
     ));
 

classes/DbQueryConstructor.php

Spacing +3 added lines, -3 removed lines

@@ -231,7 +231,7 @@ 
   // TODO - rewrite
   public function getParamsFromStaticClass($className) {
     if (is_string($className) && $className && class_exists($className)) {
-      if(method_exists($className, 'getDb')) {
+      if (method_exists($className, 'getDb')) {
         $this->setDb($className::getDb());
       }
       $this->from($className::$_table);
@@ -398,14 +398,14 @@ 
    */
   protected function processField($fieldName) {
     if (is_bool($fieldName)) {
-      $result = (string)intval($fieldName);
+      $result = (string) intval($fieldName);
     } elseif (is_numeric($fieldName)) {
       $result = $fieldName;
     } elseif (is_null($fieldName)) {
       $result = 'NULL';
     } else {
       // Field has other type - string or should be convertible to string
-      $result = (string)$fieldName;
+      $result = (string) $fieldName;
       if (!$fieldName instanceof DbSqlLiteral) {
         $result = $this->quoteField($fieldName);
       }

classes/UnitList.php

Spacing +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
    */
   public function unitsCostInMetal($shipCostInMetalPerPiece) {
     $shipsCostInMetal = array();
-    foreach($this->mapUnitIdToDb as $ship_id => $ship) {
+    foreach ($this->mapUnitIdToDb as $ship_id => $ship) {
       $shipsCostInMetal[$ship_id] = $ship->count * $shipCostInMetalPerPiece[$ship_id];
     }
 

classes/debug.php

Spacing +39 added lines, -40 removed lines

@@ -32,7 +32,7 @@ 
 
 defined('INSIDE') || die();
 
-if(php_sapi_name() == "cli") {
+if (php_sapi_name() == "cli") {
   // In cli-mode
   define('__DEBUG_CRLF', "\r\n");
   define('__DEBUG_LINE', '-------------------------------------------------' . __DEBUG_CRLF);
@@ -52,16 +52,16 @@ 
   public function log_file($message, $ident_change = 0) {
     static $ident = 0;
 
-    if(!defined('SN_DEBUG_LOG')) {
+    if (!defined('SN_DEBUG_LOG')) {
       return;
     }
 
-    if($this->log_file_handler === null) {
+    if ($this->log_file_handler === null) {
       $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
       @fwrite($this->log_file_handler, "\r\n\r\n");
     }
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
-    if($this->log_file_handler) {
+    if ($this->log_file_handler) {
       @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
     }
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
@@ -92,8 +92,8 @@ 
     $result = array();
     $transaction_id = classSupernova::$db->getTransaction()->getNextQueryTransactionId();
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
@@ -110,7 +110,7 @@ 
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -131,26 +131,26 @@ 
   public function dump($dump = false, $force_base = false, $deadlock = false) {
     global $user, $planetrow;
 
-    if($dump === false) {
+    if ($dump === false) {
       return;
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -158,22 +158,21 @@ 
       }
     }
 
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       $error_backtrace['locks'] = classSupernova::$gc->snCache->getLocks();
       $error_backtrace['cSN_data'] = classSupernova::$gc->snCache->getData();
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) {
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$gc->snCache->getQueries();
     }
 
-    if($base_dump) {
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
-        foreach($this->log_array as $log) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -202,14 +201,14 @@ 
   public function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $sys_stop_log_hit, $sys_log_disabled, $user;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     sn_db_transaction_rollback();
 
-    if(classSupernova::$config->debug == 1) {
+    if (classSupernova::$config->debug == 1) {
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -221,7 +220,7 @@ 
 
     $userId = empty($user['id']) ? 0 : $user['id'];
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($userId) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -240,7 +239,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print(__DEBUG_LINE);
         pdump($value, $name);
       }
@@ -258,7 +257,7 @@ 
   public function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
@@ -267,7 +266,7 @@ 
 
     $userId = empty($user['id']) ? 0 : $user['id'];
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($userId) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -285,11 +284,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -298,7 +297,7 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
@@ -306,22 +305,22 @@ 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == TYPE_STRING) {
+  if ($type == TYPE_STRING) {
     $dumper .= '(' . strlen($value) . ')';
     $value = dump($value, '', -1);
-  } elseif($type == TYPE_BOOLEAN) {
+  } elseif ($type == TYPE_BOOLEAN) {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
+    foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == TYPE_ARRAY) {
+  } elseif ($type == TYPE_ARRAY) {
     $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
+    foreach ($value as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
       $dumper .= dump($val, '', $level + 1);
     }
@@ -341,7 +340,7 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
     $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
       (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
       $backtrace[1]['function'] .
@@ -368,7 +367,7 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
   print(mt_rand() . __DEBUG_CRLF);
@@ -378,7 +377,7 @@ 
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
   print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);
@@ -409,7 +408,7 @@ 
  */
 function pdie($message = '', $level = 0) {
   $backtrace = debug_backtrace();
-  for($i = 0; $i < $level; $i++) {
+  for ($i = 0; $i < $level; $i++) {
     array_pop($backtrace);
   }
 

classes/PropertyHider.php

Spacing +7 added lines, -7 removed lines

@@ -277,7 +277,7 @@ 
    * @return string
    */
   protected function adjustPropertyString($name, $diff) {
-    return (string)$this->$name . (string)$diff;
+    return (string) $this->$name . (string) $diff;
   }
 
   /**
@@ -287,8 +287,8 @@ 
    * @return array
    */
   protected function adjustPropertyArray($name, $diff) {
-    $copy = (array)$this->$name;
-    HelperArray::merge($copy, (array)$diff, HelperArray::MERGE_PHP);
+    $copy = (array) $this->$name;
+    HelperArray::merge($copy, (array) $diff, HelperArray::MERGE_PHP);
 
     return $copy;
   }
@@ -300,7 +300,7 @@ 
    * @return int
    */
   protected function deltaInteger($name, $diff) {
-    return (int)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0) + (int)$diff;
+    return (int) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0) + (int) $diff;
   }
 
   /**
@@ -310,7 +310,7 @@ 
    * @return float
    */
   protected function deltaDouble($name, $diff) {
-    return (float)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0.0) + (float)$diff;
+    return (float) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0.0) + (float) $diff;
   }
 
   /**
@@ -320,7 +320,7 @@ 
    * @return string
    */
   protected function deltaString($name, $diff) {
-    return (string)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, '') . (string)$diff;
+    return (string) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, '') . (string) $diff;
   }
 
   /**
@@ -330,7 +330,7 @@ 
    * @return array
    */
   protected function deltaArray($name, $diff) {
-    $copy = (array)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, array());
+    $copy = (array) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, array());
     HelperArray::merge($copy, $diff, HelperArray::MERGE_PHP);
 
     return $copy;

classes/DbSqlAware.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
    */
   protected function quoteFieldSimpleByRef(&$string) {
     $string = $this->escapeString($string);
-    if ((string)$string && '*' != $string) {
+    if ((string) $string && '*' != $string) {
       $string = '`' . $string . '`';
     }
   }

classes/SnDbCachedOperator.php

Spacing +2 added lines, -2 removed lines

@@ -242,7 +242,7 @@ 
               ($filter ? ' WHERE ' . $filter : '') .
               ($fetch ? ' LIMIT 1' : ''));
           }
-          while($row = db_fetch($query)) {
+          while ($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
             if (!$this->snCache->cache_lock_get($owner_location_type, $row['parent_id'])) {
               $parent_id_list[$row['parent_id']] = $row['parent_id'];
@@ -282,7 +282,7 @@ 
           . " FOR UPDATE"
         );
       }
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         // Caching record in row cache
         $this->snCache->cache_set($location_type, $row);
         // Making ref to cached record in query cache