supernova-ws / SuperNova

classes/SN.php

Braces +12 added lines, -4 removed lines

@@ -419,7 +419,8 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -427,6 +428,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         _SnCacheInternal::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         _SnCacheInternal::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -460,9 +462,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -483,10 +487,12 @@ 
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         _SnCacheInternal::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
@@ -500,11 +506,13 @@ 
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         _SnCacheInternal::cache_clear($location_type);
       }
+      }
     }
 
     return $result;

includes/functions/flt_mission_missile.php

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 use DBAL\OldDbChangeSet;
 use Planet\DBStaticPlanet;
 
-function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0')
-{
+function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0') {
   // Here we select which part of defense should take damage: structure or shield
   // $damageTo = P_SHIELD;
   // $damageTo = P_STRUCTURE;
@@ -37,8 +36,7 @@ 
     $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
     $structures[$targetedStructure][0] -= $structsDestroyed;
     $MIPDamage -= $structsDestroyed*$damageDone;
-  }
-  else
+  } else
   {
     // REALLY random attack
     $can_be_damaged = sn_get_groups('defense_active');

includes/functions/int_fleet_events.php

Braces +6 added lines, -12 removed lines

@@ -3,8 +3,7 @@ 
 
 use Planet\DBStaticPlanet;
 
-function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false)
-{
+function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) {
   global $config, $user, $fleet_number, $lang;
 
   $fleet_events = array();
@@ -25,12 +24,10 @@ 
     if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
-    }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    } elseif($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
-    }
-    else
+    } else
     {
       $planet_end = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_end_galaxy'], $fleet['fleet_end_system'], $fleet['fleet_end_planet'], $planet_end_type, false, 'name');
       $fleet['fleet_end_name'] = $planet_end['name'];
@@ -82,8 +79,7 @@ 
   return $fleet_events;
 }
 
-function flt_register_fleet_event($fleet, $ov_label, $planet_end_type)
-{
+function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) {
   global $user, $planetrow, $fleet_number;
 
   switch($fleet['ov_label'] = $ov_label)
@@ -123,8 +119,7 @@ 
   if($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
-  }
-  else
+  } else
   {
     $user_data = db_user_by_id($fleet['fleet_owner']);
   }
@@ -136,8 +131,7 @@ 
  * @param array    $planetrow
  * @param template $template
  */
-function int_planet_pretemplate($planetrow, &$template)
-{
+function int_planet_pretemplate($planetrow, &$template) {
   global $lang, $user;
 
   $governor_id = $planetrow['PLANET_GOVERNOR_ID'];

includes/includes/art_artifact.php

Braces +9 added lines, -14 removed lines

@@ -5,8 +5,7 @@ 
 use Que\DBStaticQue;
 use Universe\Universe;
 
-function art_use(&$user, &$planetrow, $unit_id)
-{
+function art_use(&$user, &$planetrow, $unit_id) {
   global $lang;
 
   if(!in_array($unit_id, sn_get_groups('artifacts')))
@@ -53,14 +52,12 @@ 
           {
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moonSize, $updateDebris);
             $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), HelperString::numberFloorAndFormat($moonSize));
-          }
-          else
+          } else
           {
             $message = $lang['art_lhc_moon_fail'];
           }
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_ADMIN, $lang['art_lhc_from'], $lang['art_lhc_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_moon_exists'];
         }
@@ -88,8 +85,9 @@ 
         $sectors_used = 0;
         foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
         {
-          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
-            continue;
+          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) {
+                      continue;
+          }
           $sectors_used += $levels_deployed;
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']);
         }
@@ -123,8 +121,7 @@ 
           DBStaticQue::db_que_set_time_left_by_id($que_item['que_id'], $que_item['que_time_left']);
           $message = sprintf($lang['art_heurestic_chip_ok'], $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], sys_time_human($old_time - $que_item['que_time_left']));
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_heurestic_chip_subj'], $lang['art_heurestic_chip_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_heurestic_chip_no_research'];
         }
@@ -152,8 +149,7 @@ 
             $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], $planetrow['name'], uni_render_coordinates($planetrow), sys_time_human($old_time - $que_item['que_time_left'])
           );
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_nano_builder_subj'], $lang['art_nano_builder_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_nano_builder_no_que'];
         }
@@ -165,8 +161,7 @@ 
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user);
       OldDbChangeSet::db_changeset_apply($db_changeset);
     }
-  }
-  else
+  } else
   {
     $message = $lang['art_err_no_artifact'];
   }

classes/Common/Pimple/ServiceProviderInterface.php

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
  * @author  Fabien Potencier
  * @author  Dominik Zogg
  */
-interface ServiceProviderInterface
-{
+interface ServiceProviderInterface {
     /**
      * Registers services on the given container.
      *

classes/Common/Pimple/Container.php

Braces +12 added lines, -24 removed lines

@@ -31,8 +31,7 @@ 
  *
  * @author  Fabien Potencier
  */
-class Container implements \ArrayAccess
-{
+class Container implements \ArrayAccess {
     private $values = array();
     private $factories;
     private $protected;
@@ -47,8 +46,7 @@ 
      *
      * @param array $values The parameters or objects.
      */
-    public function __construct(array $values = array())
-    {
+    public function __construct(array $values = array()) {
         $this->factories = new \SplObjectStorage();
         $this->protected = new \SplObjectStorage();
 
@@ -71,8 +69,7 @@ 
      *
      * @throws \RuntimeException Prevent override of a frozen service
      */
-    public function offsetSet($id, $value)
-    {
+    public function offsetSet($id, $value) {
         if (isset($this->frozen[$id])) {
             throw new \RuntimeException(sprintf('Cannot override frozen service "%s".', $id));
         }
@@ -90,8 +87,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function offsetGet($id)
-    {
+    public function offsetGet($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -125,8 +121,7 @@ 
      *
      * @return bool
      */
-    public function offsetExists($id)
-    {
+    public function offsetExists($id) {
         return isset($this->keys[$id]);
     }
 
@@ -135,8 +130,7 @@ 
      *
      * @param string $id The unique identifier for the parameter or object
      */
-    public function offsetUnset($id)
-    {
+    public function offsetUnset($id) {
         if (isset($this->keys[$id])) {
             if (is_object($this->values[$id])) {
                 unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
@@ -155,8 +149,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function factory($callable)
-    {
+    public function factory($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Service definition is not a Closure or invokable object.');
         }
@@ -177,8 +170,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function protect($callable)
-    {
+    public function protect($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Callable is not a Closure or invokable object.');
         }
@@ -197,8 +189,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function raw($id)
-    {
+    public function raw($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -223,8 +214,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined or not a service definition
      */
-    public function extend($id, $callable)
-    {
+    public function extend($id, $callable) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -256,8 +246,7 @@ 
      *
      * @return array An array of value names
      */
-    public function keys()
-    {
+    public function keys() {
         return array_keys($this->values);
     }
 
@@ -269,8 +258,7 @@ 
      *
      * @return static
      */
-    public function register(ServiceProviderInterface $provider, array $values = array())
-    {
+    public function register(ServiceProviderInterface $provider, array $values = array()) {
         $provider->register($this);
 
         foreach ($values as $key => $value) {

classes/template.php

Braces +29 added lines, -58 removed lines

@@ -22,8 +22,7 @@ 
 * Base Template class.
 * @package phpBB3
 */
-class template
-{
+class template {
   /** variable that holds all the data we'll be substituting into
   * the compiled templates. Takes form:
   * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
@@ -82,8 +81,7 @@ 
   * Set template location
   * @access public
   */
-  function set_template()
-  {
+  function set_template() {
     global $user;
 
     if (file_exists($this->rootPhysical. 'styles/' . $user->theme['template_path'] . '/template'))
@@ -108,8 +106,7 @@ 
       {
         $this->inherit_root = $this->rootPhysical . 'styles/' . $user->theme['template_inherit_path'] . '/template';
       }
-    }
-    else
+    } else
     {
       trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR);
     }
@@ -123,8 +120,7 @@ 
   * Set custom template location (able to use directory outside of phpBB)
   * @access public
   */
-  function set_custom_template($template_path, $template_name, $fallback_template_path = false)
-  {
+  function set_custom_template($template_path, $template_name, $fallback_template_path = false) {
     global $user;
 
     // Make sure $template_path has no ending slash
@@ -145,8 +141,7 @@ 
 
       $this->inherit_root = $fallback_template_path;
       $this->orig_tpl_inherits_id = true;
-    }
-    else
+    } else
     {
       $this->orig_tpl_inherits_id = false;
     }
@@ -165,8 +160,7 @@ 
   * should be a hash of handle => filename pairs.
   * @access public
   */
-  function set_filenames($filename_array)
-  {
+  function set_filenames($filename_array) {
     if (!is_array($filename_array))
     {
       return false;
@@ -194,8 +188,7 @@ 
   * Destroy template data set
   * @access public
   */
-  function destroy()
-  {
+  function destroy() {
     $this->_tpldata = array('.' => array(0 => array()));
     $this->_rootref = &$this->_tpldata['.'][0];
   }
@@ -204,8 +197,7 @@ 
   * Reset/empty complete block
   * @access public
   */
-  function destroy_block_vars($blockname)
-  {
+  function destroy_block_vars($blockname) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -220,8 +212,7 @@ 
       }
 
       unset($str[$blocks[$blockcount]]);
-    }
-    else
+    } else
     {
       // Top-level block.
       unset($this->_tpldata[$blockname]);
@@ -234,8 +225,7 @@ 
   * Display handle
   * @access public
   */
-  function display($handle, $include_once = true)
-  {
+  function display($handle, $include_once = true) {
     if (defined('IN_ERROR_HANDLER'))
     {
       $is_enotice = error_reporting();
@@ -248,8 +238,7 @@ 
     if ($filename = $this->_tpl_load($handle))
     {
       ($include_once) ? include_once($filename) : include($filename);
-    }
-    else
+    } else
     {
       $this->evaluate($this->compiled_code[$handle]);
     }
@@ -261,8 +250,7 @@ 
   * Display the handle and assign the output to a template variable or return the compiled result.
   * @access public
   */
-  function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)
-  {
+  function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) {
     ob_start();
     $this->display($handle, $include_once);
     $contents = ob_get_clean();
@@ -281,8 +269,7 @@ 
   * Load a compiled template if possible, if not, recompile it
   * @access private
   */
-  function _tpl_load(&$handle)
-  {
+  function _tpl_load(&$handle) {
     global $user, $config;
 
     if (!isset($this->filename[$handle]))
@@ -303,8 +290,7 @@ 
     if (!file_exists($filename) || @filesize($filename) === 0)
     {
       $recompile = true;
-    }
-    else if ($config->load_tplcompile)
+    } else if ($config->load_tplcompile)
     {
       // No way around it: we need to check inheritance here
       if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle]))
@@ -387,15 +373,13 @@ 
               $this->files[$row['template_filename']] = $file;
               $this->files_inherit[$row['template_filename']] = $file;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
-            }
-            else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
+            } else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
             {
               // Ok, we have a situation. There is a file in the subtemplate, but nothing in the DB. We have to fix that.
               $force_reload = true;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
             }
-          }
-          else
+          } else
           {
             $this->files_template[$row['template_filename']] = $user->theme['template_id'];
           }
@@ -405,8 +389,7 @@ 
             if ($row['template_filename'] == $this->filename[$handle])
             {
               $compile->_tpl_load_file($handle, true);
-            }
-            else
+            } else
             {
               $this->files[$row['template_filename']] = $file;
               $this->filename[$row['template_filename']] = $row['template_filename'];
@@ -421,8 +404,7 @@ 
           {
             $this->compiled_code[$handle] = $compile->compile(trim($row['template_data']));
             $compile->compile_write($handle, $this->compiled_code[$handle]);
-          }
-          else
+          } else
           {
             // Only bother compiling if it doesn't already exist
             if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX))
@@ -433,8 +415,7 @@ 
             }
           }
         }
-      }
-      else
+      } else
       {
         $file = $this->root . '/' . $row['template_filename'];
 
@@ -461,8 +442,7 @@ 
   * Assign key variable pairs from an array
   * @access public
   */
-  function assign_vars($vararray)
-  {
+  function assign_vars($vararray) {
     foreach ($vararray as $key => $val)
     {
       $this->_rootref[$key] = $val;
@@ -475,8 +455,7 @@ 
   * Assign a single variable to a single key
   * @access public
   */
-  function assign_var($varname, $varval)
-  {
+  function assign_var($varname, $varval) {
     $this->_rootref[$varname] = $varval;
 
     return true;
@@ -486,8 +465,7 @@ 
   * Assign key variable pairs from an array to a specified block
   * @access public
   */
-  function assign_block_vars($blockname, $vararray)
-  {
+  function assign_block_vars($blockname, $vararray) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -522,8 +500,7 @@ 
       // We're adding a new iteration to this block with the given
       // variable assignments.
       $str[$blocks[$blockcount]][] = $vararray;
-    }
-    else
+    } else
     {
       // Top-level block.
       $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0;
@@ -577,8 +554,7 @@ 
   * @return bool false on error, true on success
   * @access public
   */
-  function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert')
-  {
+  function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') {
     if (strpos($blockname, '.') !== false)
     {
       // Nested blocks are not supported
@@ -623,8 +599,7 @@ 
         $key = sizeof($this->_tpldata[$blockname]);
         unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']);
         $vararray['S_LAST_ROW'] = true;
-      }
-      else if ($key === 0)
+      } else if ($key === 0)
       {
         unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']);
         $vararray['S_FIRST_ROW'] = true;
@@ -663,8 +638,7 @@ 
   * Include a separate template
   * @access private
   */
-  function _tpl_include($filename, $include = true)
-  {
+  function _tpl_include($filename, $include = true) {
     // This is used to access global vars
     // global $lang, $config, $user; // Not needed!
 
@@ -694,8 +668,7 @@ 
   * Include a php-file
   * @access private
   */
-  function _php_include($filename)
-  {
+  function _php_include($filename) {
     $file = $this->rootPhysical . $filename;
 
     if (!file_exists($file))
@@ -711,8 +684,7 @@ 
   * Assign key variable pairs from an array with block support
   * @access public
   */
-  function assign_recursive($values, $name = '')
-  {
+  function assign_recursive($values, $name = '') {
     if(isset($values['.']))
     {
       $values_extra = $values['.'];
@@ -722,8 +694,7 @@ 
     if(!$name)
     {
       $this->assign_vars($values);
-    }
-    else
+    } else
     {
       $this->assign_block_vars($name, $values);
     }

includes/general/general_math.php

Braces +18 added lines, -15 removed lines

@@ -4,16 +4,14 @@ 
   return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
 }
 
-function sn_floor($value)
-{
+function sn_floor($value) {
   return $value >= 0 ? floor($value) : ceil($value);
 }
 
 // Эта функция выдает нормально распределенное случайное число с матожиднием $mu и стандартным отклонением $sigma
 // $strict - количество $sigma, по которым идет округление функции. Т.е. $strict = 3 означает, что диапазон значений обрезается по +-3 * $sigma
 // Используется http://ru.wikipedia.org/wiki/Преобразование_Бокса_—_Мюллера
-function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false)
-{
+function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false) {
   // http://ru.wikipedia.org/wiki/Среднеквадратическое_отклонение
   // При $mu = 0 (график симметричный, цифры только для половины графика)
   // От 0 до $sigma ~ 34.1%
@@ -43,7 +41,7 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
   if($cut_extreme) {
     $range_start--;
     $range_end++;
@@ -98,12 +96,10 @@ 
  *
  * @return float
  */
-function avg($array)
-{
+function avg($array) {
   return is_array($array) && count($array) ? array_sum($array) / count($array) : 0;
 }
-function linear_calc(&$linear, $from = 0, $debug = false)
-{
+function linear_calc(&$linear, $from = 0, $debug = false) {
   for($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
@@ -112,7 +108,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if($debug) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -122,7 +120,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if($debug) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -139,11 +139,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($debug) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
+    if($debug) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

includes/general/general_pname.php

Braces +2 added lines, -4 removed lines

@@ -2,12 +2,10 @@
 
 // Эти функции будут переписаны по добавлению инфы в БД
 
-function pname_factory_production_field_name($factory_unit_id)
-{
+function pname_factory_production_field_name($factory_unit_id) {
   return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
 }
 
-function pname_resource_name($resource_id)
-{
+function pname_resource_name($resource_id) {
   return get_unit_param($resource_id, P_NAME);
 }
\ No newline at end of file