supernova-ws / SuperNova

includes/update_old.php

Braces +6 added lines, -12 removed lines

@@ -197,8 +197,7 @@ 
           if($old_que_item[4] == 'build')
           {
             $old_que_item[4] = BUILD_CREATE;
-          }
-          else
+          } else
           {
             $old_que_item[4] = BUILD_DESTROY;
           }
@@ -667,18 +666,15 @@ 
             if(preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2))
             {
               $reason = RPG_MARKET;
-            }
-            elseif(preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2))
+            } elseif(preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2))
             {
               $reason = RPG_MERCENARY;
               $comment = "Spent for mercenary {$matches2[1]} GUID {$matches2[2]}";
-            }
-            elseif(preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2))
+            } elseif(preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2))
             {
               $reason = RPG_REFERRAL;
               $comment = "Incoming from referral ID {$matches[1]}";
-            }
-            elseif(preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2))
+            } elseif(preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2))
             {
               $reason = RPG_ADMIN;
               $comment = $matches2[1];
@@ -1716,8 +1712,7 @@ 
         if(!isset($found[$index]))
         {
           $found[$index] = $row['BUDDY_ID'];
-        }
-        else
+        } else
         {
           $lost[] = $row['BUDDY_ID'];
         }
@@ -2169,8 +2164,7 @@ 
               $que_data[QI_PLANET_ID] = 'NULL';
             }
           }
-        }
-        else
+        } else
         {
           $que_data[QI_PLANET_ID] = 'NULL';
         }

includes/debug.class.php

Braces +3 added lines, -1 removed lines

@@ -140,11 +140,13 @@
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
       foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
+        foreach($location as $location_id => &$location_data) {
+          //          $location_data = $location_id;
         {
           $location_data = isset($location_data['username']) ? $location_data['username'] :
             (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
+        }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }

includes/update.php

Braces +21 added lines, -9 removed lines

@@ -399,7 +399,9 @@ 
         $units_levels = array();
         foreach($planet_unit_list as $unit_id) {
           $unit_name = &$units_info[$unit_id][P_NAME];
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) continue;
+          if(!isset($row[$unit_name]) || !$row[$unit_name]) {
+            continue;
+          }
           $units_levels[$unit_id] = $row[$unit_name];
           $unit_data[] = "({$user_id}," . LOC_PLANET . ",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
           if(count($unit_data) > 30) {
@@ -413,7 +415,9 @@ 
         if($row['que']) {
           $que = explode(';', $row['que']);
           foreach($que as $que_item) {
-            if(!$que_item) continue;
+            if(!$que_item) {
+              continue;
+            }
 
             $que_item = explode(',', $que_item);
 
@@ -445,9 +449,13 @@ 
           $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0, );
           $hangar_units = sys_unit_str2arr($row['b_hangar_id']);
           foreach($hangar_units as $unit_id => $unit_count) {
-            if($unit_count <= 0) continue;
+            if($unit_count <= 0) {
+              continue;
+            }
             foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) continue;
+              if(!in_array($resource_id, $group_resource_loot)) {
+                continue;
+              }
               $return_resources[$resource_id] += $unit_count * $resource_amount;
             }
           }
@@ -464,11 +472,13 @@ 
         }
       }
 
-      if(!empty($unit_data))
-        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+      if(!empty($unit_data)) {
+              upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+      }
 
-      if(!empty($que_data))
-        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
+      if(!empty($que_data)) {
+              upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
+      }
 
       upd_alter_table('planets', $drop, true);
     }
@@ -761,9 +771,11 @@ 
         !empty($strings) ? doquery($query_string . implode(',', $strings)) : false;
       }
 
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
+      if(isset($update_tables['counter']['page'])) {
+        // TODO REMOVE
       {
         update_security_url("SELECT DISTINCT `page` as url FROM {{counter}}");
+      }
         update_security_url("SELECT DISTINCT `url` as url FROM {{counter}}");
       }
     }

includes/functions/eco_queue.php

Braces +1 added lines, -2 removed lines

@@ -458,8 +458,7 @@
 
     if(is_numeric($planet['id'])) {
       db_planet_set_by_id($planet['id'], "`que_processed` = UNIX_TIMESTAMP(NOW())");
-    }
-    elseif(is_numeric($user['id'])) {
+    } elseif(is_numeric($user['id'])) {
       db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
     }
 

includes/functions/qst_quest.php

Braces +18 added lines, -22 removed lines

@@ -33,8 +33,7 @@ 
           if($quest_rewards_amount < 0)
           {
             throw new Exception($lang['qst_adm_err_reward_amount']);
-          }
-          elseif($quest_rewards_amount > 0)
+          } elseif($quest_rewards_amount > 0)
           {
             $quest_rewards[] = "{$quest_rewards_id},{$quest_rewards_amount}";
           }
@@ -75,8 +74,7 @@ 
               `quest_rewards` = '{$quest_rewards}'
             WHERE `quest_id` = {$quest_id} LIMIT 1;"
           );
-        }
-        else
+        } else
         {
           sn_db_perform('{{quest}}', array(
             'quest_name' => $quest_name,
@@ -94,8 +92,7 @@ 
           msg_send_simple_message('*', 0, 0, MSG_TYPE_PLAYER, $lang['sys_administration'], $lang['news_title'], $text);
         }
         */
-      }
-      catch (Exception $e)
+      } catch (Exception $e)
       {
         message($e->getMessage(), $lang['sys_error']);
       }
@@ -119,8 +116,7 @@ 
     }
     $query = doquery("SELECT count(*) AS count FROM {{quest}};", '', true);
     $config->db_saveItem('quest_total', $query['count']);
-  }
-  elseif(!$user_id)
+  } elseif(!$user_id)
   {
     $user_id = $user['id'];
   }
@@ -137,8 +133,7 @@ 
   if($quest)
   {
     $quest_templatized = qst_templatize(qst_quest_parse($quest, false));
-  }
-  else
+  } else
   {
     $quest_templatized['quest_rewards_list'] = array();
   }
@@ -193,8 +188,7 @@ 
       if($status == null)
       {
         $query_add_where .= "IS NULL";
-      }
-      else
+      } else
       {
         $query_add_where .= "= {$status}";
       }
@@ -223,8 +217,7 @@ 
   if($block_name)
   {
     $template->assign_block_vars($block_name, $quest_templatized);
-  }
-  else
+  } else
   {
     $template->assign_vars($quest_templatized);
     if(!empty($quest_templatized['quest_rewards_list']))
@@ -292,7 +285,9 @@ 
 
 function qst_reward(&$user, &$rewards, &$quest_list)
 {
-  if(empty($rewards)) return;
+  if(empty($rewards)) {
+    return;
+  }
 
   global $lang;
 
@@ -300,11 +295,12 @@ 
   $total_rewards = array();
   $comment_dm = '';
 
-  foreach($rewards as $quest_id => $user_data)
-    foreach($user_data as $user_id => $planet_data)
+  foreach($rewards as $quest_id => $user_data) {
+      foreach($user_data as $user_id => $planet_data)
       foreach($planet_data as $planet_id => $reward_list)
       {
         $comment = sprintf($lang['qst_msg_complete_body'], $quest_list[$quest_id]['quest_name']);
+  }
         $comment_dm .= isset($reward_list[RES_DARK_MATTER]) ? $comment : '';
 
         $comment_reward = array();
@@ -336,17 +332,17 @@ 
         $local_changeset = array();
         foreach($unit_data as $unit_id => $unit_amount)
         {
-          if(!isset($quest_rewards_allowed[$unit_id])) continue;
+          if(!isset($quest_rewards_allowed[$unit_id])) {
+            continue;
+          }
 
           if($unit_id == RES_DARK_MATTER)
           {
             rpg_points_change($user['id'], RPG_QUEST, $unit_amount, $comment_dm);
-          }
-          elseif(isset($group_resources[$unit_id]))
+          } elseif(isset($group_resources[$unit_id]))
           {
             $local_changeset[pname_resource_name($unit_id)] = array('delta' => $unit_amount);
-          }
-          else // Проверим на юниты
+          } else // Проверим на юниты
           {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, $unit_amount, $user_row, $planet_id);
           }

includes/functions/msg_send_simple_message.php

Braces +2 added lines, -4 removed lines

@@ -79,8 +79,7 @@ 
     // TODO Добавить $sender - рассылка может быть и от кого-то
     db_message_insert_all($message_type, $from, $subject, $text);
     $owners = array();
-  }
-  else
+  } else
   {
     $insert_values = array();
     $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
@@ -90,8 +89,7 @@ 
       if($user['id'] != $owner)
       {
         $owner_row = db_user_by_id($owner);
-      }
-      else
+      } else
       {
         $owner_row = $user;
       }

includes/functions/eco_get_build_data.php

Braces +2 added lines, -4 removed lines

@@ -38,8 +38,7 @@ 
     if($user['user_as_ally'])
     {
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
-    }
-    else
+    } else
     {
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
       $lab_level['effective_level'] = 0;
@@ -238,8 +237,7 @@ 
       //{
       //  $result = true;
       //}
-    }
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
+    } elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
     {
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
     }

ajax_version_check.php

Braces +2 added lines, -4 removed lines

@@ -41,12 +41,10 @@
 if(!$check_result)
 {
   $version_check = SNC_VER_ERROR_CONNECT;
-}
-elseif(($version_check = intval($check_result)) && $version_check == $check_result)
+} elseif(($version_check = intval($check_result)) && $version_check == $check_result)
 {
   $version_check = $check_result;
-}
-else
+} else
 {
   // JSON decode if string
   $check_result = json_decode($check_result, true);

jumpgate.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }