supernova-ws / SuperNova

includes/classes/Entity.php

Doc Comments +6 added lines

@@ -60,6 +60,9 @@ 
    */
   protected static $rowOperator;
 
+  /**
+   * @param integer $propertyName
+   */
   protected function bindFieldExport(&$propertyData, $propertyName) {
     if(!empty($propertyData[P_DB_ROW_EXPORT])) {
       return;
@@ -79,6 +82,9 @@ 
     }
   }
 
+  /**
+   * @param integer $propertyName
+   */
   protected function bindFieldImport(&$propertyData, $propertyName) {
     if(!empty($propertyData[P_DB_ROW_IMPORT])) {
       return;

Spacing +5 added lines, -5 removed lines

@@ -61,7 +61,7 @@ 
   protected static $rowOperator;
 
   protected function bindFieldExport(&$propertyData, $propertyName) {
-    if(!empty($propertyData[P_DB_ROW_EXPORT])) {
+    if (!empty($propertyData[P_DB_ROW_EXPORT])) {
       return;
     }
 
@@ -73,14 +73,14 @@ 
        */
       // Alas! No bindTo() method in 5.3 closures! So we should use what we have
       // Also no auto bound of $this until 5.4
-      $propertyData[P_DB_ROW_EXPORT] = function ($that, &$row) use ($propertyName, $propertyData) {
+      $propertyData[P_DB_ROW_EXPORT] = function($that, &$row) use ($propertyName, $propertyData) {
         $row[$propertyData[P_DB_FIELD]] = $that->$propertyName;
       };
     }
   }
 
   protected function bindFieldImport(&$propertyData, $propertyName) {
-    if(!empty($propertyData[P_DB_ROW_IMPORT])) {
+    if (!empty($propertyData[P_DB_ROW_IMPORT])) {
       return;
     }
 
@@ -92,7 +92,7 @@ 
        */
       // Alas! No bindTo() method in 5.3 closures! So we should use what we have
       // Also no auto bound of $this until 5.4
-      $propertyData[P_DB_ROW_IMPORT] = function ($that, &$row) use ($propertyName, $propertyData) {
+      $propertyData[P_DB_ROW_IMPORT] = function($that, &$row) use ($propertyName, $propertyData) {
         $that->$propertyName = \Common\Types::castAs(
           !empty($propertyData[P_DB_TYPE]) ? $propertyData[P_DB_TYPE] : TYPE_EMPTY,
           $row[$propertyData[P_DB_FIELD]]
@@ -156,7 +156,7 @@ 
         // TODO - however for a sake of uniformity may be we should consider use call_user_func
 //      call_user_func($propertyData[P_DB_ROW_EXPORT], $this, $row);
       } else {
-        throw new \Exception('There is no valid DB [' . $operation . '] row operation for ' . get_called_class() . '::' . $propertyName);
+        throw new \Exception('There is no valid DB ['.$operation.'] row operation for '.get_called_class().'::'.$propertyName);
       }
     }
   }

buddy.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
  * Idea from buddy.php Created by Perberos. All rights reversed (C) 2006
  * */
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 /**
  * @var array $user
@@ -35,14 +35,14 @@ 
   $cBuddy->new_friend_name_unsafe = sys_get_param_str_unsafe('request_user_name');
   $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);
   };
 
   classSupernova::$gc->buddy->route($cBuddy);

includes/classes/DbRowDirectOperator.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
       ->setIdField($entity->getIdFieldName())
       ->field('*')
       ->from($entity->getTableName())
-      ->where($entity->getIdFieldName() . ' = "' . $entity->dbId . '"');
+      ->where($entity->getIdFieldName().' = "'.$entity->dbId.'"');
 
     $entity->importDbRow($stmt->selectRow());
   }
@@ -27,7 +27,7 @@ 
   public function deleteById($entity) {
     $db = $entity->getDbStatic();
 
-    $db->doquery("DELETE FROM `{{" . $entity->getTableName() . "}}` WHERE `{$entity->getIdFieldName()}` = '{$entity->dbId}' LIMIT 1;");
+    $db->doquery("DELETE FROM `{{".$entity->getTableName()."}}` WHERE `{$entity->getIdFieldName()}` = '{$entity->dbId}' LIMIT 1;");
 
     return $db->db_affected_rows();
   }
@@ -41,8 +41,8 @@ 
     $query = array();
     foreach ($entity->exportRowWithoutId() as $fieldName => $fieldValue) {
       // TODO: MORE type detection
-      if(!is_numeric($fieldValue)) {
-        $fieldValue = "'" . $db->db_escape($fieldValue) . "'";
+      if (!is_numeric($fieldValue)) {
+        $fieldValue = "'".$db->db_escape($fieldValue)."'";
       }
       $query[] = "`{$fieldName}` = {$fieldValue}";
     }
@@ -53,7 +53,7 @@ 
       return 0;
     }
 
-    $db->doquery("INSERT INTO `{{" . $entity->getTableName() . "}}` SET " . $query);
+    $db->doquery("INSERT INTO `{{".$entity->getTableName()."}}` SET ".$query);
 
     // TODO Exceptiion if db_insert_id() is empty
     return $entity->dbId = $db->db_insert_id();

includes/classes/Common/Types.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
       break;
 
       case TYPE_ARRAY:
-        $value = (array)$value;
+        $value = (array) $value;
       break;
 
       case TYPE_STRING:
@@ -38,7 +38,7 @@ 
       case TYPE_EMPTY:
         // No-type defaults to string
       default:
-        $value = (string)$value;
+        $value = (string) $value;
       break;
     }
 

includes/classes/classSupernova.php

Spacing +24 added lines, -26 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,35 +994,35 @@ 
     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->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);
     });
 
@@ -1037,7 +1035,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/DBStaticUser.php

Spacing +9 added lines, -9 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()->doquery($query);
@@ -69,7 +69,7 @@ 
    */
   public static function db_user_count($online = false) {
     return intval(static::getDb()->doQueryFetchValue(
-      'SELECT COUNT(`id`) AS `user_count` FROM `{{users}}` WHERE `user_as_ally` IS NULL' . ($online ? ' AND `onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
+      'SELECT COUNT(`id`) AS `user_count` FROM `{{users}}` WHERE `user_as_ally` IS NULL'.($online ? ' AND `onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
     ));
   }
 
@@ -91,7 +91,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");
 
@@ -109,7 +109,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();
@@ -191,7 +191,7 @@ 
   }
 
   public static function db_user_list_set_mass_mail(&$owners_list, $set) {
-    return classSupernova::db_upd_record_list(LOC_USER, !empty($owners_list) ? '`id` IN (' . implode(',', $owners_list) . ');' : '', $set);
+    return classSupernova::db_upd_record_list(LOC_USER, !empty($owners_list) ? '`id` IN ('.implode(',', $owners_list).');' : '', $set);
   }
 
   public static function db_user_list_set_by_ally_and_rank($ally_id, $ally_rank_id, $set) {
@@ -206,7 +206,7 @@ 
    * @param array $playerArray
    */
   public static function renderNameAndCoordinates($playerArray) {
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
   }
 
 //  // TODO - IoC test