supernova-ws / SuperNova

includes/includes/flt_mission_destroy.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 function flt_mission_destroy($mission_data) {
   $fleet_row = $mission_data['fleet'];
   $destination_planet = $mission_data['dst_planet'];
-  if(!$destination_planet || !is_array($destination_planet) || $destination_planet['planet_type'] != PT_MOON) {
+  if (!$destination_planet || !is_array($destination_planet) || $destination_planet['planet_type'] != PT_MOON) {
     fleet_send_back($fleet_row);
 
     return CACHE_FLEET;

includes/includes/upd_helpers.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
 function upd_db_unit_by_location($user_id = 0, $location_type, $location_id, $unit_snid = 0, $for_update = false, $fields = '*') {
   return db_fetch(upd_do_query(
-    "SELECT {$fields}
+    "select {$fields}
     FROM {{unit}}
     WHERE
       `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() .

Spacing +38 added lines, -38 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('IN_UPDATE')) {
+if (!defined('IN_UPDATE')) {
   die('Trying to call update helpers externally!');
 }
 
@@ -8,12 +8,12 @@ 
   global $update_tables;
 
   upd_add_more_time();
-  if(!$no_log) {
+  if (!$no_log) {
     upd_log_message("Performing query '{$query}'");
   }
 
-  if(strpos($query, '{{') !== false) {
-    foreach($update_tables as $tableName => $cork) {
+  if (strpos($query, '{{') !== false) {
+    foreach ($update_tables as $tableName => $cork) {
       $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
     }
   }
@@ -25,9 +25,9 @@ 
   global $config, $sys_log_disabled;
 
   $config->db_loadItem($key);
-  if($condition || !isset($config->$key)) {
+  if ($condition || !isset($config->$key)) {
     upd_add_more_time();
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       upd_log_message("Updating config key '{$key}' with value '{$default_value}'");
     }
     $config->db_saveItem($key, $default_value);
@@ -55,7 +55,7 @@ 
 function upd_log_message($message) {
   global $sys_log_disabled, $upd_log, $debug;
 
-  if($sys_log_disabled)
+  if ($sys_log_disabled)
   {
 //    print("{$message}<br />");
   } else {
@@ -67,15 +67,15 @@ 
 function upd_unset_table_info($table_name) {
   global $update_tables, $update_indexes, $update_foreigns;
 
-  if(isset($update_tables[$table_name])) {
+  if (isset($update_tables[$table_name])) {
     unset($update_tables[$table_name]);
   }
 
-  if(isset($update_indexes[$table_name])) {
+  if (isset($update_indexes[$table_name])) {
     unset($update_indexes[$table_name]);
   }
 
-  if(isset($update_foreigns[$table_name])) {
+  if (isset($update_foreigns[$table_name])) {
     unset($update_foreigns[$table_name]);
   }
 }
@@ -89,18 +89,18 @@ 
   upd_unset_table_info($tableName);
 
   $q1 = upd_do_query("SHOW FULL COLUMNS FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_tables[$tableName][$r1['Field']] = $r1;
   }
 
   $q1 = upd_do_query("SHOW INDEX FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_indexes[$tableName][$r1['Key_name']] .= "{$r1['Column_name']},";
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name). "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
-  while($r1 = db_fetch($q1)) {
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
+  while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace($config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
     $update_foreigns[$tableName][$r1['CONSTRAINT_NAME']] .= "{$r1['COLUMN_NAME']},{$table_referenced},{$r1['REFERENCED_COLUMN_NAME']};";
@@ -110,7 +110,7 @@ 
 function upd_alter_table($table, $alters, $condition = true) {
   global $config, $update_tables;
 
-  if(!$condition) {
+  if (!$condition) {
     return;
   }
 
@@ -118,7 +118,7 @@ 
   $alters_print = is_array($alters) ? dump($alters) : $alters;
   upd_log_message("Altering table '{$table}' with alterations {$alters_print}");
 
-  if(!is_array($alters)) {
+  if (!is_array($alters)) {
     $alters = array($alters);
   }
 
@@ -128,7 +128,7 @@ 
 
   $result = upd_do_query($qry);
   $error = db_error();
-  if($error) {
+  if ($error) {
     die("Altering error for table `{$table}`: {$error}<br />{$alters_print}");
   }
 
@@ -155,19 +155,19 @@ 
 function upd_create_table($table_name, $declaration, $tableOptions = '') {
   global $config, $update_tables;
 
-  if(!$update_tables[$table_name]) {
+  if (!$update_tables[$table_name]) {
     upd_do_query('set foreign_key_checks = 0;', true);
     $declaration = trim($declaration);
-    if(substr($declaration, 0, 1) != '(') {
+    if (substr($declaration, 0, 1) != '(') {
       $declaration = "($declaration)";
     }
     $tableOptions = trim($tableOptions);
-    if(!empty($tableOptions)) {
+    if (!empty($tableOptions)) {
       $declaration .= $tableOptions;
     }
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$config->db_prefix}{$table_name}` {$declaration}");
     $error = db_error();
-    if($error) {
+    if ($error) {
       die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
@@ -193,14 +193,14 @@ 
 
 
 function upd_db_unit_changeset_prepare($unit_id, $unit_value, $user, $planet_id = null) {
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER is not ARRAY</h1>');
     pdump(debug_backtrace());
     die('USER is not ARRAY');
   }
 
-  if(!isset($user['id']) || !$user['id']) {
+  if (!isset($user['id']) || !$user['id']) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER[id] пустой</h1>');
     pdump($user);
@@ -215,7 +215,7 @@ 
 
   $db_changeset = array();
   $temp = upd_db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
-  if($temp['unit_id']) {
+  if ($temp['unit_id']) {
     // update
     $db_changeset = array(
       'action' => SQL_OP_UPDATE,
@@ -261,53 +261,53 @@ 
 
 
 function upd_db_changeset_apply($db_changeset) {
-  if(!is_array($db_changeset) || empty($db_changeset)) {
+  if (!is_array($db_changeset) || empty($db_changeset)) {
     return;
   }
 
-  foreach($db_changeset as $table_name => $table_data) {
-    foreach($table_data as $record_id => $conditions) {
+  foreach ($db_changeset as $table_name => $table_data) {
+    foreach ($table_data as $record_id => $conditions) {
       $where = '';
-      if(!empty($conditions['where'])) {
+      if (!empty($conditions['where'])) {
         $where = 'WHERE ' . implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
-      if($conditions['fields']) {
-        foreach($conditions['fields'] as $field_name => $field_data) {
+      if ($conditions['fields']) {
+        foreach ($conditions['fields'] as $field_name => $field_data) {
           $condition = "`{$field_name}` = ";
           $value = '';
-          if($field_data['delta']) {
+          if ($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']);
+          } elseif ($field_data['set']) {
+            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
-          if($value) {
+          if ($value) {
             $fields[] = $condition . $value;
           }
         }
       }
       $fields = implode(',', $fields);
 
-      switch($conditions['action']) {
+      switch ($conditions['action']) {
         case SQL_OP_DELETE:
           upd_do_query("DELETE FROM {{{$table_name}}} {$where}");
           break;
 
         case SQL_OP_UPDATE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("UPDATE {{{$table_name}}} SET {$fields} {$where}");
           }
           break;
 
         case SQL_OP_INSERT:
-          if($fields) {
+          if ($fields) {
             upd_do_query("INSERT INTO {{{$table_name}}} SET {$fields}");
           }
           break;
 
         case SQL_OP_REPLACE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("REPLACE INTO {{{$table_name}}} SET {$fields}");
           }
           break;

includes/includes/flt_mission_transport.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
   $source_planet      = &$mission_data['src_planet'];
   $destination_planet = &$mission_data['dst_planet'];
 
-  if(!isset($destination_planet['id']) || !$destination_planet['id_owner'])
+  if (!isset($destination_planet['id']) || !$destination_planet['id_owner'])
   {
     // doquery("UPDATE {{fleets}} SET `fleet_mess` = 1 WHERE `fleet_id` = {$fleet_row['fleet_id']} LIMIT 1;");
     fleet_send_back($fleet_row);
@@ -27,10 +27,10 @@ 
     $destination_planet['name'], uni_render_coordinates_href($fleet_row, 'fleet_end_', 3, ''),
     $fleet_row['fleet_resource_metal'], $lang['Metal'],
     $fleet_row['fleet_resource_crystal'], $lang['Crystal'],
-    $fleet_row['fleet_resource_deuterium'], $lang['Deuterium'] );
+    $fleet_row['fleet_resource_deuterium'], $lang['Deuterium']);
   msg_send_simple_message($fleet_row['fleet_target_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
 
-  if($fleet_row['fleet_target_owner'] <> $fleet_row['fleet_owner'])
+  if ($fleet_row['fleet_target_owner'] <> $fleet_row['fleet_owner'])
   {
     msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
   }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
  * @copyright 2008 By Chlorel for XNova
  */
 
-function flt_mission_transport(&$mission_data)
-{
+function flt_mission_transport(&$mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $source_planet      = &$mission_data['src_planet'];
   $destination_planet = &$mission_data['dst_planet'];

index.php

Spacing +3 added lines, -3 removed lines

@@ -5,14 +5,14 @@
  */
 global $template;
 
-if(isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
+if (isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
   require_once('common.' . substr(strrchr(__FILE__, '.'), 1));
-  if($sn_page_name) {
+  if ($sn_page_name) {
     // Loading page-specific language files
 
     !empty($sn_mvc['model'][$sn_page_name]) and execute_hooks($sn_mvc['model'][$sn_page_name], $template, 'model', $sn_page_name);
     !empty($sn_mvc['view'][$sn_page_name]) and execute_hooks($sn_mvc['view'][$sn_page_name], $template, 'view', $sn_page_name);
-    if(!empty($template_result) && is_object($template)) {
+    if (!empty($template_result) && is_object($template)) {
       $template->assign_recursive($template_result);
     }
 

classes/AjaxController.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 
     define('IN_AJAX', true);
 
-    if(!is_object($template)) {
+    if (!is_object($template)) {
       $template = gettemplate('_ajax', true);
     }
 
@@ -37,16 +37,16 @@ 
 
     $mode = sys_get_param_str('mode');
 
-    if(class_exists($className = 'Pages\\Page' . ucfirst($mode))) {
+    if (class_exists($className = 'Pages\\Page' . ucfirst($mode))) {
       /**
        * @var \Pages\IPage $page
        */
       $page = new $className();
-      if(method_exists($page, 'loadParams')) {
+      if (method_exists($page, 'loadParams')) {
         $page->loadParams();
       }
 
-      if(method_exists($page, $action = sys_get_param('action')) && $page->checkAction($action)) {
+      if (method_exists($page, $action = sys_get_param('action')) && $page->checkAction($action)) {
         $result = $page->$action();
         is_array($result) ? HelperArray::merge($template_result['AJAX'], $result) : false;
       }

classes/PTLTag.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     $this->raw = $stringTag;
 
     // Separating params - so there are will be no false-positives for template's variable names
-    if(strpos($this->raw, '|') !== false) {
+    if (strpos($this->raw, '|') !== false) {
       $this->params = explode('|', $this->raw);
       $this->resolved = $this->params[0];
       unset($this->params[0]);

classes/Pages/PageQuest.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
       QUEST_STATUS_COMPLETE => '',
     );
 
-    if(!isset($statuses[$this->filterQuestStatus])) {
+    if (!isset($statuses[$this->filterQuestStatus])) {
       $this->filterQuestStatus = QUEST_STATUS_ALL;
     }
   }

classes/TextModel.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
       }
     }
 
-    if(!isset($next)) {
+    if (!isset($next)) {
       $next = new TextEntity();
     }
 
@@ -119,7 +119,7 @@ 
       $prev = $this->getById($currentText->prev);
     }
 
-    if(!isset($prev)) {
+    if (!isset($prev)) {
       $prev = new TextEntity();
     }
 

classes/DBAL/DbQuery.php

Spacing +3 added lines, -3 removed lines

@@ -338,7 +338,7 @@ 
    * @return string
    */
   protected function stringValue($value) {
-    return "'" . $this->escape((string)$value) . "'";
+    return "'" . $this->escape((string) $value) . "'";
   }
 
   /**
@@ -349,7 +349,7 @@ 
    * @return string
    */
   public function quote($fieldName) {
-    return "`" . $this->escape((string)$fieldName) . "`";
+    return "`" . $this->escape((string) $fieldName) . "`";
   }
 
   /**
@@ -396,7 +396,7 @@ 
    * @return string
    */
   protected function quoteTable($tableName) {
-    return "`{{" . $this->escape((string)$tableName) . "}}`";
+    return "`{{" . $this->escape((string) $tableName) . "}}`";
   }
 
   /**