supernova-ws / SuperNova

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]. '\']';
     }

includes/classes/template.php

Braces +13 added lines, -26 removed lines

@@ -89,8 +89,7 @@ 
       {
         $this->inherit_root = $phpbb_root_path . '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);
     }
@@ -126,8 +125,7 @@ 
 
       $this->inherit_root = $fallback_template_path;
       $this->orig_tpl_inherits_id = true;
-    }
-    else
+    } else
     {
       $this->orig_tpl_inherits_id = false;
     }
@@ -201,8 +199,7 @@ 
       }
 
       unset($str[$blocks[$blockcount]]);
-    }
-    else
+    } else
     {
       // Top-level block.
       unset($this->_tpldata[$blockname]);
@@ -238,8 +235,7 @@ 
     if ($filename = $this->_tpl_load($handle))
     {
       ($include_once) ? include_once($filename) : include($filename);
-    }
-    else
+    } else
     {
       eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
     }
@@ -293,8 +289,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]))
@@ -382,15 +377,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'];
           }
@@ -400,8 +393,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'];
@@ -416,8 +408,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))
@@ -428,8 +419,7 @@ 
             }
           }
         }
-      }
-      else
+      } else
       {
         $file = $this->root . '/' . $row['template_filename'];
 
@@ -517,8 +507,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;
@@ -618,8 +607,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;
@@ -719,8 +707,7 @@ 
     if(!$name)
     {
       $this->assign_vars($values);
-    }
-    else
+    } else
     {
       $this->assign_block_vars($name, $values);
     }

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;
       }