supernova-ws / SuperNova

includes/classes/PropertyHiderInObject.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 class PropertyHiderInObject extends PropertyHider {
   private function getPhysicalPropertyName($name) {
-    return '_' . $name;
+    return '_'.$name;
   }
 
   /**

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/PropertyHider.php

Spacing +15 added lines, -15 removed lines

@@ -76,13 +76,13 @@ 
 
   protected function checkPropertyExists($name) {
     if (!array_key_exists($name, $this->_properties)) {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] not exists', ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] not exists', ERR_ERROR);
     }
   }
 
   protected function checkOverwriteAdjusted($name) {
     if (array_key_exists($name, $this->propertiesAdjusted)) {
-      throw new PropertyAccessException('Property [' . get_called_class() . '::' . $name . '] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
+      throw new PropertyAccessException('Property ['.get_called_class().'::'.$name.'] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
     }
   }
 
@@ -131,7 +131,7 @@ 
    * @return boolean
    */
   public function isContainerEmpty() {
-    throw new Exception('PropertyHider::isContainerEmpty() is not implemented. You should implement it in class ' . get_called_class());
+    throw new Exception('PropertyHider::isContainerEmpty() is not implemented. You should implement it in class '.get_called_class());
   }
 
 
@@ -175,15 +175,15 @@ 
     $result = null;
     // Now deciding - will we call a protected setter or will we work with protected property
     // Todo - on init recalc all method_exists
-    if (method_exists($this, $methodName = $action . ucfirst($name))) {
+    if (method_exists($this, $methodName = $action.ucfirst($name))) {
       // If method exists - just calling it
       // TODO - should return TRUE if value changed or FALSE otherwise
       $result = call_user_func_array(array($this, $methodName), array($value));
     } elseif ($this->isPropertyActionAvailable($name, $action)) {
       // No setter exists - works directly with protected property
-      $result = $this->{$action . 'Property'}($name, $value);
+      $result = $this->{$action.'Property'}($name, $value);
     } else {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] does not have ' . $action . 'ter/property to ' . $action, ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] does not have '.$action.'ter/property to '.$action, ERR_ERROR);
     }
 
     return $result;
@@ -274,7 +274,7 @@ 
    * @return string
    */
   protected function adjustPropertyString($name, $diff) {
-    return (string)$this->$name . (string)$diff;
+    return (string) $this->$name.(string) $diff;
   }
 
   /**
@@ -284,8 +284,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;
   }
@@ -297,7 +297,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;
   }
 
   /**
@@ -307,7 +307,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;
   }
 
   /**
@@ -317,7 +317,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;
   }
 
   /**
@@ -327,7 +327,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;
@@ -350,10 +350,10 @@ 
     // Capitalizing type name
     $methodName = explode(' ', $type);
     array_walk($methodName, 'DbSqlHelper::UCFirstByRef');
-    $methodName = $prefix . implode('', $methodName);
+    $methodName = $prefix.implode('', $methodName);
 
     if (!method_exists($this, $methodName)) {
-      throw new ExceptionTypeUnsupported('Type "' . $type . '" is unsupported in PropertyHider::propertyMethodResult');
+      throw new ExceptionTypeUnsupported('Type "'.$type.'" is unsupported in PropertyHider::propertyMethodResult');
     }
 
     return call_user_func(array($this, $methodName), $name, $diff);

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/V2PropertyContainer.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
     if (is_callable($callable)) {
       $this->accessors[$type][$varName] = $callable;
     } else {
-      throw new Exception('Error assigning callable in ' . get_called_class() . '! Callable typed [' . $type . '] is not a callable or not accessible in the scope');
+      throw new Exception('Error assigning callable in '.get_called_class().'! Callable typed ['.$type.'] is not a callable or not accessible in the scope');
     }
   }
 
@@ -73,7 +73,7 @@ 
   }
 
   public function importRow($row) {
-    if(empty($row)) {
+    if (empty($row)) {
       return;
     }
 

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

@@ -27,14 +27,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);
     };
 
     $result = array();

includes/classes/classSupernova.php

Doc Comments +4 added lines, -1 removed lines

@@ -200,7 +200,7 @@ 
   /**
    * Блокирует указанные таблицу/список таблиц
    *
-   * @param string|array $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
+   * @param string $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
    * <p>string - название таблицы для блокировки</p>
    * <p>array - массив, где ключ - имя таблицы, а значение - условия блокировки элементов</p>
    */
@@ -377,6 +377,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $location_type
+   */
   public static function db_ins_field_set($location_type, $field_set, $serialize = false) {
     // TODO multiinsert
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set, $serialize) : false;

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 
 use Vector\Vector;
-
 use Common\GlobalContainer;
 
 class classSupernova {

Spacing +25 added lines, -27 removed lines

@@ -207,7 +207,7 @@ 
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      self::$db->doSelect("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      self::$db->doSelect("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 
@@ -249,8 +249,8 @@ 
           $query = static::$db->doSelect(
             "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' : ''));
           while ($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
@@ -263,13 +263,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->doSelect(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
         . " FOR UPDATE"
       );
@@ -341,7 +341,7 @@ 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if ($result = static::$db->doUpdate("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::$db->doUpdate("UPDATE {{{$table_name}}} SET ".$set.($condition ? ' WHERE '.$condition : ''))) {
 
       if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -499,7 +499,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = static::$db->doSelectFetch(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         . " FOR UPDATE"
       );
       SnCache::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -515,7 +515,7 @@ 
 
     if ($user === null && !empty($where_safe)) {
       // Вытаскиваем запись
-      $user = static::$db->doSelectFetch("SELECT * FROM {{users}} WHERE {$where_safe}" . " FOR UPDATE");
+      $user = static::$db->doSelectFetch("SELECT * FROM {{users}} WHERE {$where_safe}"." FOR UPDATE");
 
       SnCache::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
     }
@@ -557,7 +557,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);
@@ -616,7 +616,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}";
@@ -730,13 +730,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);
@@ -750,9 +750,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('Неподдерживаемый тип условия');
@@ -779,7 +777,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) {
@@ -866,7 +864,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);
       });
     }
@@ -882,43 +880,43 @@ 
     $gc = static::$gc;
 
     // Default db
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       $db = new db_mysql($c);
       $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 (GlobalContainer $c) {
+    $gc->localePlayer = function(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 (GlobalContainer $c) {
+    $gc->buddy = $gc->factory(function(GlobalContainer $c) {
       return new $c->buddyClass($c);
     });
 
-    $gc->query = $gc->factory(function (GlobalContainer $c) {
+    $gc->query = $gc->factory(function(GlobalContainer $c) {
       return new DbQueryConstructor($c->db);
     });
 
-    $gc->unit = $gc->factory(function (GlobalContainer $c) {
+    $gc->unit = $gc->factory(function(GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     });
 
@@ -931,7 +929,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'];

Braces +3 added lines, -1 removed lines

@@ -363,9 +363,11 @@
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::$db->doInsert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = classSupernova::$db->db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего

includes/classes/db_mysql.php

Doc Comments +9 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -163,7 +163,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    */
   protected function logQuery($query) {
     if (!classSupernova::$config->debug) {
@@ -352,6 +352,10 @@ 
   }
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -375,6 +379,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query) {
     if ($this->skipQueryCheck) {
       return;

Spacing +28 added lines, -28 removed lines

@@ -83,7 +83,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;
 
@@ -103,7 +103,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 - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
@@ -155,7 +155,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);
       }
     }
 
@@ -228,12 +228,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;
@@ -364,10 +364,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;
@@ -393,37 +393,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);