supernova-ws / SuperNova

buddy.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

includes/classes/classSupernova.php

Spacing +26 added lines, -28 removed lines

@@ -228,7 +228,7 @@ 
 
     if (!empty($error_msg)) {
       // TODO - Убрать позже
-      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
+      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - '.$error_msg.'</h1>');
       $backtrace = debug_backtrace();
       array_shift($backtrace);
       pdump($backtrace);
@@ -241,7 +241,7 @@ 
   public static function db_transaction_start($level = '') {
     static::db_transaction_check(null);
 
-    $level ? doquery('SET TRANSACTION ISOLATION LEVEL ' . $level) : false;
+    $level ? doquery('SET TRANSACTION ISOLATION LEVEL '.$level) : false;
 
     static::$transaction_id++;
     doquery('START TRANSACTION');
@@ -305,7 +305,7 @@ 
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 
@@ -365,8 +365,8 @@ 
           $query = static::db_query(
             "SELECT
               distinct({{{$location_info[P_TABLE_NAME]}}}.{$owner_data[P_OWNER_FIELD]}) AS parent_id
-            FROM {{{$location_info[P_TABLE_NAME]}}}" .
-            ($filter ? ' WHERE ' . $filter : '') .
+            FROM {{{$location_info[P_TABLE_NAME]}}}".
+            ($filter ? ' WHERE '.$filter : '').
             ($fetch ? ' LIMIT 1' : ''), false, true);
 
           while ($row = db_fetch($query)) {
@@ -379,13 +379,13 @@ 
           if ($indexes_str = implode(',', $parent_id_list)) {
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             static::db_get_record_list($owner_location_type,
-              $parent_id_field . (count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
+              $parent_id_field.(count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
           }
         }
       }
 
       $query = static::db_query(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
       );
       while ($row = db_fetch($query)) {
@@ -456,7 +456,7 @@ 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if ($result = static::db_query("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::db_query("UPDATE {{{$table_name}}} SET ".$set.($condition ? ' WHERE '.$condition : ''))) {
 
       if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -614,7 +614,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = static::db_query(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         , true);
       SnCache::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
     }
@@ -671,7 +671,7 @@ 
     }
 
     if (SnCache::isUnitLocatorNotSet($location_type, $location_id)) {
-      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . static::db_unit_time_restrictions());
+      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".static::db_unit_time_restrictions());
       if (!empty($got_data) && is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           SnCache::setUnitLocatorByLocationAndIDs($location_type, $location_id, $unit_data);
@@ -730,7 +730,7 @@ 
     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') . ")";
+      $query[] = "(`que_planet_id` = {$planet_id}".($que_type ? '' : ' OR que_planet_id IS NULL').")";
     }
     if ($que_type) {
       $query[] = "`que_type` = {$que_type}";
@@ -844,13 +844,13 @@ 
         $condition = "`{$field_name}` = ";
         $value = '';
         if ($field_data['delta']) {
-          $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
+          $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
         } elseif ($field_data['set']) {
           $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
         if ($value) {
-          $fields[] = $condition . $value;
+          $fields[] = $condition.$value;
         }
       }
       $conditions[P_FIELDS_STR] = implode(',', $fields);
@@ -864,9 +864,7 @@ 
           // Простое условие - $field_id = $field_value
           if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'".db_escape($field_value)."'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');
@@ -893,7 +891,7 @@ 
         die('Неподдерживаемая операция в classSupernova::db_changeset_condition_compile');
     }
 
-    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR] . ' ' . $conditions[P_FIELDS_STR] . (' WHERE ' . $conditions[P_WHERE_STR]);
+    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR].' '.$conditions[P_FIELDS_STR].(' WHERE '.$conditions[P_WHERE_STR]);
   }
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
@@ -981,7 +979,7 @@ 
     ini_get('magic_quotes_sybase') ? die('SN is incompatible with \'magic_quotes_sybase\' turned on. Disable it in php.ini or .htaccess...') : false;
     if (@get_magic_quotes_gpc()) {
       $gpcr = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-      array_walk_recursive($gpcr, function (&$value, $key) {
+      array_walk_recursive($gpcr, function(&$value, $key) {
         $value = stripslashes($value);
       });
     }
@@ -996,43 +994,43 @@ 
     static::$gc = new Common\GlobalContainer();
     $gc = static::$gc;
 
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       $db = new db_mysql();
       $db->sn_db_connect();
 
       return $db;
     };
 
-    $gc->debug = function ($c) {
+    $gc->debug = function($c) {
       return new debug();
     };
 
-    $gc->cache = function ($c) {
+    $gc->cache = function($c) {
       return new classCache(classSupernova::$cache_prefix);
     };
 
-    $gc->config = function ($c) {
+    $gc->config = function($c) {
       return new classConfig(classSupernova::$cache_prefix);
     };
 
-    $gc->localePlayer = function (Common\GlobalContainer $c) {
+    $gc->localePlayer = function(Common\GlobalContainer $c) {
       return new classLocale($c->config->server_locale_log_usage);
     };
 
-    $gc->dbRowOperator = function ($c) {
+    $gc->dbRowOperator = function($c) {
       return new DbRowDirectOperator($c);
     };
 
     $gc->buddyClass = 'Buddy\BuddyModel';
-    $gc->buddy = $gc->factory(function (Common\GlobalContainer $c) {
+    $gc->buddy = $gc->factory(function(Common\GlobalContainer $c) {
       return new $c->buddyClass($c);
     });
 
-    $gc->query = $gc->factory(function (Common\GlobalContainer $c) {
+    $gc->query = $gc->factory(function(Common\GlobalContainer $c) {
       return new DbQueryConstructor($c->db);
     });
 
-    $gc->unit = $gc->factory(function (Common\GlobalContainer $c) {
+    $gc->unit = $gc->factory(function(Common\GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     });
 
@@ -1045,7 +1043,7 @@ 
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
     self::$sn_secret_word = $dbsettings['secretword'];

includes/classes/V2Unit/V2UnitModel.php

Spacing +6 added lines, -6 removed lines

@@ -78,12 +78,12 @@ 
     $that = $this;
 
     $this->_container->assignAccessor('type', P_CONTAINER_GETTER,
-      function () use ($that) {
+      function() use ($that) {
         return $that->type;
       }
     );
     $this->_container->assignAccessor('type', P_CONTAINER_SETTER,
-      function ($value) use ($that) {
+      function($value) use ($that) {
         $that->type = $value;
         $array = get_unit_param($value);
         $that->unitInfo = $array;
@@ -99,7 +99,7 @@ 
     $propertyName = 'timeStart';
     $fieldName = self::$_properties[$propertyName][P_DB_FIELD];
     $this->_container->assignAccessor($propertyName, P_CONTAINER_IMPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         if (isset($row[$fieldName])) {
           $dateTime = new \DateTime($row[$fieldName]);
         } else {
@@ -109,7 +109,7 @@ 
       }
     );
     $this->_container->assignAccessor($propertyName, P_CONTAINER_EXPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         $dateTime = $that->timeStart;
         if ($dateTime instanceof \DateTime) {
           $row[$fieldName] = $dateTime->format(FMT_DATE_TIME_SQL);
@@ -122,7 +122,7 @@ 
     $propertyName = 'timeFinish';
     $fieldName = self::$_properties[$propertyName][P_DB_FIELD];
     $this->_container->assignAccessor($propertyName, P_CONTAINER_IMPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         if (isset($row[$fieldName])) {
           $dateTime = new \DateTime($row[$fieldName]);
         } else {
@@ -132,7 +132,7 @@ 
       }
     );
     $this->_container->assignAccessor($propertyName, P_CONTAINER_EXPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         $dateTime = $that->timeFinish;
         if ($dateTime instanceof \DateTime) {
           $row[$fieldName] = $dateTime->format(FMT_DATE_TIME_SQL);

includes/classes/Buddy/BuddyView.php

Spacing +4 added lines, -4 removed lines

@@ -31,14 +31,14 @@
       $cBuddy->new_request_text_unsafe = sys_get_param_str_unsafe('request_text');
       $cBuddy->playerArray = $user;
 
-      $cBuddy->playerId = function (BuddyRoutingParams $cBuddy) {
+      $cBuddy->playerId = function(BuddyRoutingParams $cBuddy) {
         return $cBuddy->playerArray['id'];
       };
-      $cBuddy->playerName = function (BuddyRoutingParams $cBuddy) {
+      $cBuddy->playerName = function(BuddyRoutingParams $cBuddy) {
         return $cBuddy->playerArray['username'];
       };
-      $cBuddy->playerNameAndCoordinates = function (BuddyRoutingParams $cBuddy) {
-        return "{$cBuddy->playerArray['username']} " . uni_render_coordinates($cBuddy->playerArray);
+      $cBuddy->playerNameAndCoordinates = function(BuddyRoutingParams $cBuddy) {
+        return "{$cBuddy->playerArray['username']} ".uni_render_coordinates($cBuddy->playerArray);
       };
 
       $gc->buddy->route($cBuddy);