supernova-ws / SuperNova

includes/classes/DBAL/DbQuery.php

Spacing +9 added lines, -9 removed lines

@@ -101,17 +101,17 @@ 
   protected function buildCommand() {
     switch ($this->command) {
       case static::UPDATE:
-        $this->build[] = $this->command . " " . $this->quoteTable($this->table);
+        $this->build[] = $this->command." ".$this->quoteTable($this->table);
       break;
 
       case static::DELETE:
-        $this->build[] = $this->command . " FROM " . $this->quoteTable($this->table);
+        $this->build[] = $this->command." FROM ".$this->quoteTable($this->table);
       break;
 
       case static::REPLACE:
       case static::INSERT_IGNORE:
       case static::INSERT:
-        $this->build[] = $this->command . " INTO " . $this->quoteTable($this->table);
+        $this->build[] = $this->command." INTO ".$this->quoteTable($this->table);
       break;
     }
   }
@@ -170,7 +170,7 @@ 
     $compiled = array();
 
     foreach ($this->values as $valuesVector) {
-      $compiled[] = '(' . implode(',', $this->safeFields($valuesVector)) . ')';
+      $compiled[] = '('.implode(',', $this->safeFields($valuesVector)).')';
     }
 
     $this->build[] = implode(',', $compiled);
@@ -380,7 +380,7 @@ 
    * @return string
    */
   protected function stringValue($value) {
-    return "'" . $this->escape((string)$value) . "'";
+    return "'".$this->escape((string) $value)."'";
   }
 
   /**
@@ -391,7 +391,7 @@ 
    * @return string
    */
   protected function quote($fieldName) {
-    return "`" . $this->escape((string)$fieldName) . "`";
+    return "`".$this->escape((string) $fieldName)."`";
   }
 
   /**
@@ -402,7 +402,7 @@ 
    * @return string
    */
   protected function quoteTable($tableName) {
-    return "`{{" . $this->escape((string)$tableName) . "}}`";
+    return "`{{".$this->escape((string) $tableName)."}}`";
   }
 
   protected function castAsDbValue($value) {
@@ -482,7 +482,7 @@ 
     foreach ($fieldValues as $fieldName => $fieldValue) {
       // Integer $fieldName is DANGER! They skipped there!
       if (!is_int($fieldName)) {
-        $result[$fieldName] = $this->quote($fieldName) . " = " . $this->castAsDbValue($fieldValue);
+        $result[$fieldName] = $this->quote($fieldName)." = ".$this->castAsDbValue($fieldValue);
       }
     }
 
@@ -524,7 +524,7 @@ 
     foreach ($fields as $fieldName => $fieldValue) {
       // Integer $fieldName means "leave as is" - for expressions and already processed fields
       if (is_string($fieldName)) {
-        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (" . $this->castAsDbValue($fieldValue) . ")";
+        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (".$this->castAsDbValue($fieldValue).")";
       }
     }
 

includes/classes/db_mysql.php

Spacing +31 added lines, -31 removed lines

@@ -91,7 +91,7 @@ 
   public function load_db_settings($configFile = '') {
     $dbsettings = array();
 
-    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX : false;
+    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL."config".DOT_PHP_EX : false;
 
     require $configFile;
 
@@ -111,7 +111,7 @@ 
     }
 
     if (empty($this->dbsettings)) {
-      $this->load_db_settings(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+      $this->load_db_settings(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
@@ -163,7 +163,7 @@ 
     $sql = $query;
     if (strpos($sql, '{{') !== false) {
       foreach ($this->table_list as $tableName) {
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
       }
     }
 
@@ -234,12 +234,12 @@ 
 
     $queryResult = null;
     try {
-      $queryResult = $this->db_sql_query($stringQuery . DbSqlHelper::quoteComment($queryTrace));
+      $queryResult = $this->db_sql_query($stringQuery.DbSqlHelper::quoteComment($queryTrace));
       if (!$queryResult) {
         throw new Exception();
       }
     } catch (Exception $e) {
-      classSupernova::$debug->error($this->db_error() . "<br />{$query}<br />", 'SQL Error');
+      classSupernova::$debug->error($this->db_error()."<br />{$query}<br />", 'SQL Error');
     }
 
     return $queryResult;
@@ -578,7 +578,7 @@ 
       case TYPE_EMPTY:
         // No-type defaults to string
       default:
-        $value = "'" . $this->db_escape((string)$value) . "'";
+        $value = "'".$this->db_escape((string) $value)."'";
       break;
     }
 
@@ -606,7 +606,7 @@ 
       if (is_int($fieldName)) {
         $result[$fieldName] = $fieldValue;
       } else {
-        $result[$fieldName] = "`{$fieldName}` = " . $this->castAsDbValue($fieldValue);
+        $result[$fieldName] = "`{$fieldName}` = ".$this->castAsDbValue($fieldValue);
       }
     }
 
@@ -635,7 +635,7 @@ 
       if (is_int($fieldName)) {
         $result[$fieldName] = $fieldValue;
       } else {
-        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (" . $this->castAsDbValue($fieldValue) . ")";
+        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (".$this->castAsDbValue($fieldValue).")";
       }
     }
 
@@ -692,10 +692,10 @@ 
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
       if (!empty($_POST)) {
-        $msg .= "\n\r" . dump($_POST, '$_POST');
+        $msg .= "\n\r".dump($_POST, '$_POST');
       }
       if (!empty($_GET)) {
-        $msg .= "\n\r" . dump($_GET, '$_GET');
+        $msg .= "\n\r".dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
       $this->isWatching = false;
@@ -721,37 +721,37 @@ 
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
-        $report = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
+        $report = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
         $report .= ">Database Inforamation\n";
-        $report .= "\tID - " . $user['id'] . "\n";
-        $report .= "\tUser - " . $user['username'] . "\n";
-        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
-        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
-        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
-        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
-        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
-        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
-        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
+        $report .= "\tID - ".$user['id']."\n";
+        $report .= "\tUser - ".$user['username']."\n";
+        $report .= "\tAuth level - ".$user['authlevel']."\n";
+        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
+        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
+        $report .= "\tUser IP - ".$user['user_lastip']."\n";
+        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
+        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tCurrent Page - ".$user['current_page']."\n";
+        $report .= "\tRegister Time - ".$user['register_time']."\n";
         $report .= "\n";
 
         $report .= ">Query Information\n";
-        $report .= "\tQuery - " . $query . "\n";
+        $report .= "\tQuery - ".$query."\n";
         $report .= "\n";
 
         $report .= ">\$_SERVER Information\n";
-        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
-        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
-        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
-        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
-        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
-        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
-        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
+        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
+        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
+        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
+        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
+        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
+        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
+        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
 
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
 
-        $fp = fopen(SN_ROOT_PHYSICAL . 'badqrys.txt', 'a');
+        $fp = fopen(SN_ROOT_PHYSICAL.'badqrys.txt', 'a');
         fwrite($fp, $report);
         fclose($fp);
 

Doc Comments +30 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -171,7 +171,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    */
   protected function logQuery($query) {
     if (!classSupernova::$config->debug) {
@@ -301,6 +301,11 @@ 
 
 
   // INSERT/REPLACE
+
+  /**
+   * @param string $table
+   * @param integer $replace
+   */
   protected function doSet($table, $fieldsAndValues, $replace = DB_INSERT_PLAIN) {
     $query = DbQuery::build($this)
       ->setTable($table)
@@ -338,6 +343,10 @@ 
 
 
   // INSERTERS
+
+  /**
+   * @param string $query
+   */
   public function doInsertComplex($query) {
     return $this->doSql($query);
   }
@@ -355,7 +364,7 @@ 
    * Values should be passed as-is
    *
    * @param string   $table
-   * @param array    $fields
+   * @param string[]    $fields
    * @param string[] $values
    *
    * @return array|bool|mysqli_result|null
@@ -407,7 +416,7 @@ 
    * Self-contained - means no params used
    * Such queries usually used to make large amount of in-base calculations
    *
-   * @param $query
+   * @param string $query
    *
    * @return array|bool|mysqli_result|null
    */
@@ -425,13 +434,16 @@ 
   }
 
   /**
-   * @param $DbQuery DbQuery
+   * @param DbQuery $DbQuery DbQuery
    */
   public function doUpdateDbQueryAdjust($DbQuery) {
     return $this->doUpdateDbQuery($DbQuery);
   }
 
 
+  /**
+   * @param boolean $isOneRecord
+   */
   protected function doUpdateWhere($table, $fieldsSet, $fieldsAdjust = array(), $where = array(), $isOneRecord = DB_RECORDS_ALL, $whereDanger = array()) {
 //    $query = DbQuery::build($this)
 //      ->setTable($table)
@@ -467,10 +479,16 @@ 
     return $this->doSql($query);
   }
 
+  /**
+   * @param string $table
+   */
   public function doUpdateRowSet($table, $fieldsAndValues, $where) {
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORD_ONE);
   }
 
+  /**
+   * @param string $table
+   */
   public function doUpdateTableSet($table, $fieldsAndValues, $where = array()) {
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORDS_ALL);
   }
@@ -677,6 +695,10 @@ 
   }
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -700,6 +722,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query) {
     if ($this->skipQueryCheck) {
       return;

includes/classes/DBStaticUser.php

Doc Comments +8 added lines, -3 removed lines

@@ -104,6 +104,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $config_user_birthday_range
+   */
   public static function db_user_list_to_celebrate($config_user_birthday_range) {
     $query = static::buildDBQ()
       ->field('id', 'username', 'user_birthday', 'user_birthday_celebrated')
@@ -193,6 +196,9 @@ 
   }
 
 
+  /**
+   * @param string $username_unsafe
+   */
   public static function db_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false) {
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
     if (!($username_unsafe = trim($username_unsafe))) {
@@ -247,7 +253,6 @@ 
 
   /**
    * @param $user_id
-   * @param array $set
    * @param array $adjust
    *
    * @return array|bool|mysqli_result|null
@@ -264,8 +269,8 @@ 
    *    <p>array - запись пользователя с установленным полем ['id']</p>
    * @param bool      $for_update @deprecated
    * @param string    $fields @deprecated список полей или '*'/'' для всех полей
-   * @param null      $player
-   * @param bool|null $player Признак выбора записи пользователь типа "игрок"
+   * @param boolean      $player
+   * @param boolean $player Признак выбора записи пользователь типа "игрок"
    *    <p>null - Можно выбрать запись любого типа</p>
    *    <p>true - Выбирается только запись типа "игрок"</p>
    *    <p>false - Выбирается только запись типа "альянс"</p>

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
         ->where('`user_as_ally` IS NULL')
         ->orderBy(array('`id` DESC'));
 
-    return (string)$query->selectValue();
+    return (string) $query->selectValue();
   }
 
   /**
@@ -48,15 +48,15 @@ 
       static::buildDBQ()
         ->field('id')
         ->where("`user_as_ally` IS NULL")
-        ->where("`user_bot` = " . USER_BOT_PLAYER)
+        ->where("`user_bot` = ".USER_BOT_PLAYER)
         ->setForUpdate();
 
     return $query->selectIterator();
   }
 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
-    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = " . idval($user['id']) .
-      (!empty($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '')
+    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = ".idval($user['id']).
+      (!empty($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '')
       . " FOR UPDATE";
 
     static::getDb()->doSelect($query);
@@ -73,7 +73,7 @@ 
       FROM `{{users}}` 
       WHERE 
         `user_as_ally` IS NULL" .
-        ($online ? ' AND `onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
+        ($online ? ' AND `onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
     ));
   }
 
@@ -95,7 +95,7 @@ 
       ->fieldCount('r.id', 'referral_count')
       ->fieldSingleFunction('sum', 'r.dark_matter', 'referral_dm')
       ->join('LEFT JOIN {{referrals}} as r on r.id_partner = u.id')
-      ->where($online ? "`onlinetime` >= " . intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
+      ->where($online ? "`onlinetime` >= ".intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
       ->groupBy('u.id')
       ->orderBy("user_as_ally, {$sort} ASC");
 
@@ -113,7 +113,7 @@ 
       ->where('(`user_birthday_celebrated` IS NULL OR DATE_ADD(`user_birthday_celebrated`, INTERVAL 1 YEAR) < CURRENT_DATE)')
       ->where('`user_as_ally` IS NULL')
       ->having('`days_after_birthday` >= 0')
-      ->having('`days_after_birthday` < ' . intval($config_user_birthday_range))
+      ->having('`days_after_birthday` < '.intval($config_user_birthday_range))
       ->setForUpdate();
 
     $result = $query->selectIterator();
@@ -222,7 +222,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = classSupernova::$db->doSelectFetch(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         . " FOR UPDATE"
       );
       classSupernova::$gc->snCache->cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -313,7 +313,7 @@ 
    * @param array $playerArray
    */
   public static function renderNameAndCoordinates($playerArray) {
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
   }
 
   /**
@@ -347,7 +347,7 @@ 
     foreach ($playerRowFieldChanges as $resourceId => $value) {
       $fields[pname_resource_name($resourceId)] = $value;
     }
-    if(!empty($fields)) {
+    if (!empty($fields)) {
       classSupernova::$gc->db->doUpdateRowAdjust(
         TABLE_USERS,
         array(),

includes/db.php

Doc Comments +3 added lines, -1 removed lines

@@ -16,7 +16,6 @@ 
  * @param       $user
  * @param       $planet
  * @param array $unit_list
- * @param null  $query
  */
 function db_change_resources(&$user, &$planet, $unit_list) {
   $group = sn_get_groups('resources_loot');
@@ -56,6 +55,9 @@ 
 
 }
 
+/**
+ * @param boolean $transaction_should_be_started
+ */
 function sn_db_transaction_check($transaction_should_be_started = null) {
   return classSupernova::$gc->db->getTransaction()->check($transaction_should_be_started);
 }

Spacing +4 added lines, -4 removed lines

@@ -24,22 +24,22 @@
   $locationType = sys_get_unit_location($user, $planet, key($unit_list));
 
   $resourcesChange = array();
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_resources() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_resources() вызван для не-ресурсов!');
     }
 
-    if(empty($unit_amount)) {
+    if (empty($unit_amount)) {
       continue;
     }
 
     $resourcesChange[pname_resource_name($unit_id)] += $unit_amount;
   }
 
-  if($locationType == LOC_USER) {
+  if ($locationType == LOC_USER) {
     $locationId = $user['id'];
   } else {
     $locationId = $planet['id'];

resources.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  *
  **/
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 /**
  * @param          $resource_id
@@ -36,7 +36,7 @@ 
   $storage_fill = $caps_real['total_storage'][$resource_id] ? floor(mrc_get_level($user, $planetrow, $resource_id) / $caps_real['total_storage'][$resource_id] * 100) : 0;
 
   $template->assign_block_vars('resources', array(
-    'NAME' => classLocale::$lang["sys_" . pname_resource_name($resource_id)],
+    'NAME' => classLocale::$lang["sys_".pname_resource_name($resource_id)],
 
     'HOURLY'  => pretty_number($totalProduction, true, true),
     'WEEKLY'  => pretty_number($totalProduction * 24 * 7, true, true),
@@ -76,12 +76,12 @@ 
       $planetrow[$field_name] = $percent;
       $SubQry[$field_name] = $percent;
     } else {
-      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
+      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID'.$prod_id, 'Resource Page', 301);
       continue;
     }
   }
 
-  if(!empty($SubQry)) {
+  if (!empty($SubQry)) {
     DBStaticPlanet::db_planet_update_set_by_id(
       $planetrow['id'],
       $SubQry

phalanx.php

Spacing +10 added lines, -10 removed lines

@@ -11,24 +11,24 @@ 
  * @copyright 2008 by Pada for XNova.project.es
  */
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('overview');
 lng_include('universe');
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  message (classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  message (classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $scan_galaxy  = sys_get_param_int('galaxy');
 $scan_system  = sys_get_param_int('system');
 $scan_planet  = sys_get_param_int('planet');
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
+$scan_planet_type = 1; // sys_get_param_int('planettype');
 $id = sys_get_param_id('id');
 
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@ 
 $sensorRange = GetPhalanxRange($sensorLevel);
 
 $system_distance = abs($source_system - $scan_system);
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
 {
-  message (classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -51,20 +51,20 @@ 
 }
 
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   message(classLocale::$lang['phalanx_planet_not_exists'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  message (classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 DBStaticPlanet::db_planet_update_adjust_by_id(
   $user['current_planet'],
   array(
-    'deuterium' => - $cost,
+    'deuterium' => -$cost,
   )
 );
 

overview.php

Spacing +38 added lines, -38 removed lines

@@ -30,7 +30,7 @@ 
 
 //define('SN_RENDER_NAVBAR_PLANET', false);
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 //$ccc = 0;
 //foreach(DBStaticUser::db_user_list_non_bots() as $ip) {
@@ -49,7 +49,7 @@ 
 
 $result = array();
 
-switch($mode = sys_get_param_str('mode')) {
+switch ($mode = sys_get_param_str('mode')) {
   case 'manage':
     sn_sys_sector_buy('overview.php?mode=manage');
 
@@ -59,7 +59,7 @@ 
     $template  = gettemplate('planet_manage', true);
     $planet_id = sys_get_param_id('planet_id');
 
-    if(sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
+    if (sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
       $planetrow['name'] = $new_name_unsafe;
       DBStaticPlanet::db_planet_update_set_by_id(
         $planetrow['id'],
@@ -67,21 +67,21 @@ 
           'name' => $new_name_unsafe,
         )
       );
-    } elseif(sys_get_param_str('action') == 'make_capital') {
+    } elseif (sys_get_param_str('action') == 'make_capital') {
       try {
         sn_db_transaction_start();
         $user = DBStaticUser::db_user_by_id($user['id'], true, '*');
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true, '*');
 
-        if($planetrow['planet_type'] != PT_PLANET) {
+        if ($planetrow['planet_type'] != PT_PLANET) {
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
         }
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
         }
 
-        if($user_dark_matter < classSupernova::$config->planet_capital_cost) {
+        if ($user_dark_matter < classSupernova::$config->planet_capital_cost) {
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
         }
 
@@ -106,16 +106,16 @@ 
         );
         sn_db_transaction_commit();
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
       try {
-        if(!uni_coordinates_valid($new_coordinates = array(
+        if (!uni_coordinates_valid($new_coordinates = array(
           'galaxy' => sys_get_param_int('new_galaxy'),
           'system' => sys_get_param_int('new_system'),
           'planet' => sys_get_param_int('new_planet')))
@@ -132,7 +132,7 @@ 
 //        $planetrow = $global_data['planet'];
 
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
-        if($can_teleport['result'] != ERR_NONE) {
+        if ($can_teleport['result'] != ERR_NONE) {
           throw new exception($can_teleport['message'], $can_teleport['result']);
         }
 
@@ -151,7 +151,7 @@ 
           array()
         );
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           DBStaticUser::db_user_set_by_id(
             $user['id'],
             array(
@@ -171,17 +171,17 @@ 
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
         );
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
           DBStaticPlanet::db_planet_update_set_by_id(
             $user['current_planet'],
@@ -207,9 +207,9 @@ 
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
         }
       } else {
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
       }
-    } elseif(
+    } elseif (
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
       && (
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -224,8 +224,8 @@ 
       $user = DBStaticUser::db_user_by_id($user['id'], true);
       $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
-      if($build_data['CAN'][BUILD_CREATE]) {
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
+      if ($build_data['CAN'][BUILD_CREATE]) {
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
         } else {
           $planetrow['PLANET_GOVERNOR_LEVEL'] = 1;
@@ -257,8 +257,8 @@ 
 
     lng_include('mrc_mercenary');
     int_planet_pretemplate($planetrow, $template);
-    foreach(sn_get_groups('governors') as $governor_id) {
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
+    foreach (sn_get_groups('governors') as $governor_id) {
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
         continue;
       }
 
@@ -310,7 +310,7 @@ 
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
     ));
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 
@@ -320,7 +320,7 @@ 
   default:
     sn_sys_sector_buy();
 
-    if(sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
+    if (sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
       $planetrow['name'] = $new_name_unsafe;
       DBStaticPlanet::db_planet_update_set_by_id(
         $planetrow['id'],
@@ -355,7 +355,7 @@ 
 
     $planet_count = 0;
     $planets_query = DBStaticPlanet::db_planet_list_sorted($user, false, '*');
-    foreach($planets_query as $an_id => $UserPlanet) {
+    foreach ($planets_query as $an_id => $UserPlanet) {
       sn_db_transaction_start();
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
       sn_db_transaction_commit();
@@ -366,16 +366,16 @@ 
 
       $planet_fleet_id = 0;
       $fleet_list = $template_planet['fleet_list'];
-      if($fleet_list['own']['count']) {
+      if ($fleet_list['own']['count']) {
         $planet_fleet_id = "p{$UserPlanet['id']}";
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
 //        $fleet_id++;tpl_parse_fleet_sn
       }
-      if($UserPlanet['planet_type'] == PT_MOON) {
+      if ($UserPlanet['planet_type'] == PT_MOON) {
         continue;
       }
       $moon = DBStaticPlanet::db_planet_by_parent($UserPlanet['id']);
-      if($moon) {
+      if ($moon) {
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
       } else {
         $moon_fill = 0;
@@ -415,7 +415,7 @@ 
     tpl_assign_fleet($template, $fleets);
 
     $lune = $planetrow['planet_type'] == PT_PLANET ? DBStaticPlanet::db_planet_by_parent($planetrow['id']) : DBStaticPlanet::db_planet_by_id($planetrow['parent_planet']);
-    if($lune) {
+    if ($lune) {
       $template->assign_vars(array(
         'MOON_ID' => $lune['id'],
         'MOON_IMG' => $lune['image'],
@@ -427,15 +427,15 @@ 
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
 
     $planet_recyclers_orbiting = 0;
-    foreach(Fleet::$snGroupRecyclers as $recycler_id) {
+    foreach (Fleet::$snGroupRecyclers as $recycler_id) {
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
     }
 
     int_planet_pretemplate($planetrow, $template);
 
     $sn_group_ques = sn_get_groups('ques');
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
         $template->assign_block_vars('ques', array(
           'ID'     => $que_id,
@@ -443,8 +443,8 @@ 
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
         ));
 
-        if(!empty($this_que)) {
-          foreach($this_que as $que_item) {
+        if (!empty($this_que)) {
+          foreach ($this_que as $que_item) {
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
           }
         }
@@ -458,7 +458,7 @@ 
       'LENGTH' => $que_hangar_length,
     ));
 
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
       $template->assign_block_vars('ques', array(
         'ID'     => SUBQUE_DEFENSE,
@@ -470,12 +470,12 @@ 
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
 
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
     }
 
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
     }
 
@@ -532,7 +532,7 @@ 
     ));
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 

admin/planet_edit.php

Spacing +11 added lines, -11 removed lines

@@ -4,16 +4,16 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 2)
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 AdminMessage('Временно не работает');
 
-require("includes/admin_planet_edit.inc" . DOT_PHP_EX);
+require("includes/admin_planet_edit.inc".DOT_PHP_EX);
 
 $template = gettemplate('admin/admin_planet_edit', true);
 
@@ -21,30 +21,30 @@ 
 $planet_id = sys_get_param_id('planet_id');
 
 $unit_list = sys_get_param('unit_list');
-if(sys_get_param('change_data') && !empty($unit_list))
+if (sys_get_param('change_data') && !empty($unit_list))
 {
   $query_string = array();
-  foreach($unit_list as $unit_id => $unit_amount)
+  foreach ($unit_list as $unit_id => $unit_amount)
   {
-    if($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
+    if ($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
     {
       $query_string[] = $unit_query_string;
     }
   }
 
-  if(!empty($query_string))
+  if (!empty($query_string))
   {
-    classSupernova::$db->doUpdateReallyComplex("UPDATE {{" . TABLE_PLANETS . "}} SET " . implode(', ', $query_string) . " WHERE `id` = {$planet_id}");
+    classSupernova::$db->doUpdateReallyComplex("UPDATE {{".TABLE_PLANETS."}} SET ".implode(', ', $query_string)." WHERE `id` = {$planet_id}");
   }
 }
 
-if($planet_id)
+if ($planet_id)
 {
   $edit_planet_row = DBStaticPlanet::db_planet_by_id($planet_id);
   admin_planet_edit_template($template, $edit_planet_row, $mode);
 }
 
-foreach($admin_planet_edit_mode_list as $page_mode => $mode_locale)
+foreach ($admin_planet_edit_mode_list as $page_mode => $mode_locale)
 {
   $template->assign_block_vars('page_menu', array(
     'ID' => $page_mode,
@@ -55,7 +55,7 @@ 
 $template->assign_vars(array(
   'MODE' => $mode,
   'PLANET_ID' => $planet_id,
-  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']] . ' ' . uni_render_planet($edit_planet_row),
+  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']].' '.uni_render_planet($edit_planet_row),
   'PAGE_HINT' => classLocale::$lang['adm_planet_edit_hint'],
 ));
 

includes/alliance/ali_internal_admin.inc

Spacing +20 added lines, -20 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
 }
 
@@ -20,11 +20,11 @@ 
 $allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   require_once('includes/includes/sys_avatar.php');
 
   $fieldChange = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
     $fieldChange['ally_tag'] = $new_tag;
     DBStaticUser::db_user_set_by_id(
       $ally['ally_user_id'],
@@ -33,19 +33,19 @@ 
       )
     );
   }
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
     $fieldChange['ally_name'] = $new_name;
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
     $fieldChange['ally_owner_range'] = $new_owner_rank;
   }
 
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
     $fieldChange['ally_web'] = $new_web;
   }
 
-  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
+  if (($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
     $fieldChange['ally_request_notallow'] = sys_get_param_int('request_notallow', $ally['ally_request_notallow']);
   }
 
@@ -55,11 +55,11 @@ 
     'AVATAR_UPLOAD_STATUS'  => $avatar_upload_result['STATUS'],
     'AVATAR_UPLOAD_MESSAGE' => $avatar_upload_result['MESSAGE'],
   ));
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $fieldChange['ally_image'] = $new_image;
   }
 
-  if(!empty($fieldChange)) {
+  if (!empty($fieldChange)) {
     classSupernova::$db->doUpdateRowSet(
       TABLE_ALLIANCE,
       $fieldChange,
@@ -70,17 +70,17 @@ 
 
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
-} elseif(sys_get_param_str('isSaveText')) {
+} elseif (sys_get_param_str('isSaveText')) {
   $text_unsafe = sys_get_param_str_unsafe('text');
   DBStaticAlly::db_ally_update_texts($text_unsafe, $ally['id'], $text_list[$allyTextID]['db_field']);
   $ally[$text_list[$allyTextID]['db_field']] = db_escape($text_unsafe);
-} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
 
   $newLeader = DBStaticUser::db_user_by_id($idNewLeader, false, `ally_id`);
-  if($newLeader['ally_id'] == $user['ally_id']) {
+  if ($newLeader['ally_id'] == $user['ally_id']) {
     sn_db_transaction_start();
     DBStaticUser::db_user_set_by_id(
       $user['id'],
@@ -99,8 +99,8 @@ 
     sn_db_transaction_commit();
     sys_redirect('alliance.php');
   }
-} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
   sn_db_transaction_start();
@@ -123,7 +123,7 @@ 
 $request = DBStaticAlly::db_ally_request_count_by_id($ally);
 
 $template->assign_vars(array(
-  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'] . ': ' . intval($request['request_count']) . '. ' . classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
+  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'].': '.intval($request['request_count']).'. '.classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
   'text'                    => $ally[$text_list[$allyTextID]['db_field']],
   'request_type'            => classLocale::$lang[$text_list[$allyTextID]['text_type']],
   't'                       => $allyTextID,
@@ -156,7 +156,7 @@ 
   $userAllyAdmins = DBStaticUser::db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
   // while ($userAllyAdmin = db_fetch($userAllyAdmins))
-  foreach($userAllyAdmins as $userAllyAdmin) {
+  foreach ($userAllyAdmins as $userAllyAdmin) {
 // pdump($userAllyAdmin);
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -164,8 +164,8 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
-  if(!$sn_ali_admin_action_locale['title']) {
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
+  if (!$sn_ali_admin_action_locale['title']) {
     continue;
   }
   $template->assign_block_vars('admin_actions', array(