supernova-ws / SuperNova

artifacts.php

Braces +2 added lines, -4 removed lines

@@ -48,13 +48,11 @@
           header("Location: artifacts.php#{$unit_id}");
           ob_end_flush();
           die();
-        }
-        else
+        } else
         {
           $Message = $lang['off_maxed_out'];
         }
-      }
-      else
+      } else
       {
         $Message = $lang['sys_no_points'];
       }

docs/txt2html.php

Braces +22 added lines, -26 removed lines

@@ -2,7 +2,9 @@ 
 
 function dump($value,$varname = "",$level=0,$dumper = "")
 {
-  if ($varname) $varname .= " = ";
+  if ($varname) {
+    $varname .= " = ";
+  }
 
   if ($level==-1)
   {
@@ -13,7 +15,9 @@ 
     $trans["\0"]='⊕';
     return strtr(htmlspecialchars($value),$trans);
   }
-  if ($level==0) $dumper = '<pre>' . $varname;
+  if ($level==0) {
+    $dumper = '<pre>' . $varname;
+  }
 
   $type = gettype($value);
   $dumper .= $type;
@@ -22,9 +26,9 @@ 
   {
     $dumper .= '('.strlen($value).')';
     $value = dump($value,"",-1);
-  }
-  elseif ($type=='boolean') $value= ($value?'true':'false');
-  elseif ($type=='object')
+  } elseif ($type=='boolean') {
+    $value= ($value?'true':'false');
+  } elseif ($type=='object')
   {
     $props= get_class_vars(get_class($value));
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
@@ -34,8 +38,7 @@ 
       $dumper .= dump($value->$key,"",$level+1);
     }
     $value= '';
-  }
-  elseif ($type=='array')
+  } elseif ($type=='array')
   {
     $dumper .= '('.count($value).')';
     foreach($value as $key=>$val)
@@ -46,7 +49,9 @@ 
     $value= '';
   }
   $dumper .= " <b>$value</b>";
-  if ($level==0) $dumper .= '</pre>';
+  if ($level==0) {
+    $dumper .= '</pre>';
+  }
   return $dumper;
 }
 
@@ -70,8 +75,7 @@ 
 if(substr(getcwd(), -4) != 'docs')
 {
   $path_prefix = 'docs/';
-}
-else
+} else
 {
   $path_prefix = '';
 }
@@ -119,8 +123,7 @@ 
       $buffer['name'] = $chapter[0];
     }
     $prev_chapter_is_header = true;
-  }
-  else
+  } else
   {
     $prev_chapter_is_header = false;
     foreach($chapter as &$note)
@@ -150,8 +153,7 @@ 
           if(!isset($note_out['name']))
           {
             $note_out['name'] = $buf_str;
-          }
-          else
+          } else
           {
             $note_out['lines'][] = $buf_str;
           }
@@ -228,36 +230,31 @@ 
             if($matches[2])
             {
               buf_print("<ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("<ul>\r\n");
             }
             buf_print('<li>');
             $last_spaces = $matches[1];
             $depth[] = $matches[2];
-          }
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
+          } elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
           {
             if(array_pop($depth))
             {
               buf_print("</ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("</ul>\r\n");
             }
             $last_spaces = $matches[1];
             buf_print('<li>');
-          }
-          elseif(strlen($last_spaces) == strlen($matches[1]))
+          } elseif(strlen($last_spaces) == strlen($matches[1]))
           {
             if($matches[2] == '' && $depth[count($depth) - 1] != '')
             {
               buf_print("</ol>\r\n");
               buf_print("<ul>\r\n");
-            }
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
+            } elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
             {
               buf_print("</ul>\r\n");
               buf_print("<ol>\r\n");
@@ -274,8 +271,7 @@ 
         if(array_pop($depth))
         {
           buf_print("</ol>\r\n");
-        }
-        else
+        } else
         {
           buf_print("</ul>\r\n");
         }

includes/general/math.php

Braces +14 added lines, -8 removed lines

@@ -86,8 +86,7 @@ 
       if($n % 2 == 0)
       {
         $median = ($args[$h] + $args[$h-1]) / 2;
-      }
-      else
+      } else
       {
         $median = $args[$h];
       }
@@ -111,7 +110,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if($debug) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +122,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if($debug) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +141,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/db/db_queries_planets.php

Braces +33 added lines, -11 removed lines

@@ -32,14 +32,18 @@ 
 function db_planet_by_parent($parent_id, $for_update = false, $fields = '*')
 {
   //if(!($parent_id = intval($parent_id))) return false;
-  if(!($parent_id = idval($parent_id))) return false;
+  if(!($parent_id = idval($parent_id))) {
+    return false;
+  }
   return classSupernova::db_get_record_list(LOC_PLANET,
     "`parent_planet` = {$parent_id} AND `planet_type` = " . PT_MOON, true);
 }
 function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*')
 {
   //if(!($planet_id = intval($planet_id)) || !($owner_id = intval($owner_id))) return false;
-  if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) return false;
+  if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
+    return false;
+  }
   return classSupernova::db_get_record_list(LOC_PLANET,
     "`id` = {$planet_id} AND `id_owner` = {$owner_id}", true);
 }
@@ -48,7 +52,9 @@ 
 function db_planet_list_moon_other($user_id, $this_moon_id)
 {
   // if(!($user_id = intval($user_id)) || !($this_moon_id = intval($this_moon_id))) return false;
-  if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) return false;
+  if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
+    return false;
+  }
   return classSupernova::db_get_record_list(LOC_PLANET,
     "`planet_type` = " . PT_MOON . " AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
 }
@@ -61,7 +67,9 @@ 
 }
 
 function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') {
-  if(!is_array($user_row)) return false;
+  if(!is_array($user_row)) {
+    return false;
+  }
   // $field_list = $field_list != '*' ? "{{planets}}.`id`, `name`, `image`, {{planets}}.`galaxy`, {{planets}}.`system`, {{planets}}.`planet`, `planet_type`{$field_list}" : $field_list;
   $conditions .= $skip_planet_id ? " AND `id` <> {$skip_planet_id} " : '';
 
@@ -80,7 +88,9 @@ 
     "`id_owner` = '{$user_row['id']}' {$conditions} ORDER BY {$order_by}");
 }
 function db_planet_list_by_user_or_planet($user_id, $planet_id) {
-  if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) return false;
+  if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
+    return false;
+  }
 
   return classSupernova::db_get_record_list(LOC_PLANET,
     $planet_id = idval($planet_id) ? "{{planets}}.`id` = {$planet_id}" : "`id_owner` = {$user_id}", $planet_id);
@@ -89,12 +99,16 @@ 
 function db_planet_set_by_id($planet_id, $set)
 {
   // if(!($planet_id = intval($planet_id))) return false;
-  if(!($planet_id = idval($planet_id))) return false;
+  if(!($planet_id = idval($planet_id))) {
+    return false;
+  }
   return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set);
 }
 function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set)
 {
-  if(!($set = trim($set))) return false;
+  if(!($set = trim($set))) {
+    return false;
+  }
 
   $si_galaxy = intval($ui_galaxy);
   $si_system = intval($ui_system);
@@ -106,13 +120,17 @@ 
 function db_planet_set_by_parent($ui_parent_id, $ss_set)
 {
   //if(!($si_parent_id = intval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false;
-  if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false;
+  if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
+    return false;
+  }
   return classSupernova::db_upd_record_list(LOC_PLANET, "`parent_planet` = {$si_parent_id}", $ss_set);
 }
 function db_planet_set_by_owner($ui_owner_id, $ss_set)
 {
   //if(!($si_owner_id = intval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false;
-  if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false;
+  if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
+    return false;
+  }
   return classSupernova::db_upd_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}", $ss_set);
 }
 
@@ -120,7 +138,9 @@ 
 function db_planet_delete_by_id($planet_id)
 {
   // if(!($planet_id = intval($planet_id))) return false;
-  if(!($planet_id = idval($planet_id))) return false;
+  if(!($planet_id = idval($planet_id))) {
+    return false;
+  }
   classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id);
   classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_location_id` = " . $planet_id);
   // Очереди очистятся автоматически по FOREIGN KEY
@@ -129,7 +149,9 @@ 
 function db_planet_list_delete_by_owner($ui_owner_id)
 {
   // if(!($si_owner_id = intval($ui_owner_id))) return false;
-  if(!($si_owner_id = idval($ui_owner_id))) return false;
+  if(!($si_owner_id = idval($ui_owner_id))) {
+    return false;
+  }
   classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}");
   classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_player_id` = " . $si_owner_id);
   // Очереди очистятся автоматически по FOREIGN KEY

includes/includes/uni_rename.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
       sn_db_transaction_commit();
       sys_redirect("galaxy.php?mode=name&galaxy={$uni_galaxy}&system={$uni_system}");
     }
-  }
-  catch (exception $e)
+  } catch (exception $e)
   {
     sn_db_transaction_rollback();
     $template->assign_block_vars('result', array(

includes/includes/market_info.inc

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 
     sn_db_transaction_commit();
     throw new Exception($info_action, ERR_NONE);
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     sn_db_transaction_rollback();
 

includes/includes/market_trader.inc

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
     if($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
-    }
-    else {
+    } else {
       // Locking user record
       $user = db_user_by_id($user['id'], true);
     }

includes/includes/sys_avatar.php

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
-    }
-    elseif($_FILES['avatar']['size'])
+    } elseif($_FILES['avatar']['size'])
     {
       if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
@@ -61,8 +60,7 @@ 
       imagedestroy($avatar_image);
       throw new Exception($lang['opt_msg_avatar_uploaded'], ERR_NONE);
     }
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     return array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

includes/classes/functions_template.php

Braces +18 added lines, -36 removed lines

@@ -66,8 +66,7 @@ 
       {
         return;
         trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-      }
-      else
+      } else
       {
         $this->template->files[$handle] = $this->template->files_inherit[$handle];
       }
@@ -225,15 +224,13 @@ 
               $var = substr($temp, 2, -1);
               //$file = $this->template->_tpldata['DEFINE']['.'][$var];
               $temp = "\$this->_tpldata['DEFINE']['.']['$var']";
-            }
-            else
+            } else
             {
               $var = substr($temp, 1, -1);
               //$file = $this->template->_rootref[$var];
               $temp = "\$this->_rootref['$var']";
             }
-          }
-          else
+          } else
           {
             $file = $temp;
           }
@@ -381,8 +378,7 @@ 
       if ($match[2] < 0)
       {
         $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-      }
-      else
+      } else
       {
         $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
       }
@@ -390,17 +386,14 @@ 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
         $loop_end = '$_' . $tag_args . '_count';
-      }
-      else if ($match[3] >= 0)
+      } else if ($match[3] >= 0)
       {
         $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-      }
-      else //if ($match[3] < -1)
+      } else //if ($match[3] < -1)
       {
         $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
       }
-    }
-    else
+    } else
     {
       $loop_start = 0;
       $loop_end = '$_' . $tag_args . '_count';
@@ -413,8 +406,7 @@ 
     {
       // We need to implode $no_nesting times from the end...
       $block = array_slice($this->block_names, -$no_nesting);
-    }
-    else
+    } else
     {
       $block = $this->block_names;
     }
@@ -424,8 +416,7 @@ 
       // Block is not nested.
       $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
-    }
-    else
+    } else
     {
       // This block is nested.
       // Generate a namespace string for this block.
@@ -573,8 +564,7 @@ 
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
             $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-          }
-          else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
+          } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
             // Allow checking if loops are set with .loopname
             // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
@@ -590,8 +580,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -599,8 +588,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -645,8 +633,7 @@ 
 
       // Now replace the php code
       $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
-    }
-    else
+    } else
     {
       preg_match('#true|false|\.#i', $match[4], $type);
 
@@ -708,8 +695,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -722,8 +708,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -735,8 +720,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -818,12 +802,10 @@ 
         $varref .= '[$_' . $blocks[$blockcount] . '_i]';
       }
       return $varref;
-    }
-    else if ($include_last_iterator)
+    } else if ($include_last_iterator)
     {
       return '$_'. $blocks[$blockcount] . '_val';
-    }
-    else
+    } else
     {
       return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
     }