Cyberbyte-Studios / CyberWorks

views/core/newUser.php

Braces +14 added lines, -4 removed lines

@@ -22,7 +22,10 @@ 
                 <p><?php echo $lang['username'] ?>:</p>
                 <input id="user_name" type="text" class="form-control"
                        placeholder="<?php echo $lang['username'] ?>" autofocus
-                       name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required>
+                       name="user_name" <?php if (isset($_POST['user_name'])) {
+    echo 'value="' . $_POST['user_name'] . '"';
+}
+?> required>
             </div>
             <div class="form-group">
                 <p><?php echo $lang['player'] . " " . $lang['id'] ?>:</p>
@@ -32,7 +35,10 @@ 
             <div class="form-group">
                 <p><?php echo $lang['emailAdd'] ?>:</p>
                 <input id="user_email" placeholder="<?php echo $lang['emailAdd'] ?>" class=" form-control" type="email"
-                       name="user_email" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required/>
+                       name="user_email" <?php if (isset($_POST['user_name'])) {
+    echo 'value="' . $_POST['user_name'] . '"';
+}
+?> required/>
             </div>
             <div class="form-group">
                 <p><?php echo $lang['password'] ?>:</p>
@@ -52,7 +58,9 @@ 
                 <select class="form-control" name="user_lvl">
                     <?php for ($rank = 1; $rank <= $settings['staffRanks']; $rank++) {
                         echo '<option value="' . $rank . '"';
-                        if (isset($_POST['user_lvl'])) if ($rank == $_POST['user_lvl']) echo 'selected';
+                        if (isset($_POST['user_lvl'])) {
+                            if ($rank == $_POST['user_lvl']) echo 'selected';
+                        }
                         echo '>' . $settings['ranks'][$rank] . '</option>';
                     } ?>
                 </select>
@@ -63,7 +71,9 @@ 
                 <select class=" form-control" name="profile_pic">
                     <?php for ($icon = 1; $icon <= 6; $icon++) {
                         echo '<option value="' . $icon . '" ';
-                        if (isset($_POST['user_name'])) if ($icon == $_POST['user_name']) echo 'selected';
+                        if (isset($_POST['user_name'])) {
+                            if ($icon == $_POST['user_name']) echo 'selected';
+                        }
                         echo '>' . $settings['names'][$icon] . '</option>';
                     } ?>
                 </select>

Spacing +9 added lines, -9 removed lines

@@ -22,17 +22,17 @@ 
                 <p><?php echo $lang['username'] ?>:</p>
                 <input id="user_name" type="text" class="form-control"
                        placeholder="<?php echo $lang['username'] ?>" autofocus
-                       name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required>
+                       name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="'.$_POST['user_name'].'"'; ?> required>
             </div>
             <div class="form-group">
-                <p><?php echo $lang['player'] . " " . $lang['id'] ?>:</p>
+                <p><?php echo $lang['player']." ".$lang['id'] ?>:</p>
                 <input id="player_id" class="form-control" placeholder="<?php echo $lang['playerID'] ?>" type="number" name="player_id">
                 <p id='steam'></p>
             </div>
             <div class="form-group">
                 <p><?php echo $lang['emailAdd'] ?>:</p>
                 <input id="user_email" placeholder="<?php echo $lang['emailAdd'] ?>" class=" form-control" type="email"
-                       name="user_email" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required/>
+                       name="user_email" <?php if (isset($_POST['user_name'])) echo 'value="'.$_POST['user_name'].'"'; ?> required/>
             </div>
             <div class="form-group">
                 <p><?php echo $lang['password'] ?>:</p>
@@ -41,8 +41,8 @@ 
                        name="user_password_new" required autocorrect="off" autocapitalize="off" autocomplete="off">
             </div>
             <div class="form-group">
-                <p><?php echo $lang['repeat'] . ' ' . $lang['password']?>:</p>
-                <input id="user_password_repeat" placeholder="<?php echo $lang['repeat'] . ' ' . $lang['password']?>" class=" form-control login_input"
+                <p><?php echo $lang['repeat'].' '.$lang['password']?>:</p>
+                <input id="user_password_repeat" placeholder="<?php echo $lang['repeat'].' '.$lang['password']?>" class=" form-control login_input"
                        type="password"
                        name="user_password_repeat" required autocorrect="off" autocapitalize="off" autocomplete="off">
             </div>
@@ -51,9 +51,9 @@ 
                 <p><?php echo $lang['level'] ?>:</p>
                 <select class="form-control" name="user_lvl">
                     <?php for ($rank = 1; $rank <= $_SESSION['user_level']; $rank++) {
-                        echo '<option value="' . $rank . '"';
+                        echo '<option value="'.$rank.'"';
                         if (isset($_POST['user_lvl'])) if ($rank == $_POST['user_lvl']) echo 'selected';
-                        echo '>' . $settings['ranks'][$rank] . '</option>';
+                        echo '>'.$settings['ranks'][$rank].'</option>';
                     } ?>
                 </select>
             </div>
@@ -62,9 +62,9 @@ 
                 <p><?php echo $lang['picture']?>:</p>
                 <select class=" form-control" name="profile_pic">
                     <?php for ($icon = 1; $icon <= 6; $icon++) {
-                        echo '<option value="' . $icon . '" ';
+                        echo '<option value="'.$icon.'" ';
                         if (isset($_POST['user_name'])) if ($icon == $_POST['user_name']) echo 'selected';
-                        echo '>' . $settings['names'][$icon] . '</option>';
+                        echo '>'.$settings['names'][$icon].'</option>';
                     } ?>
                 </select>
             </div>

views/core/editServer.php

Braces +13 added lines, -5 removed lines

@@ -6,8 +6,7 @@ 
     $sql = "DELETE FROM `servers` WHERE `dbid`='" . $id . "';";
     $result_of_query = $db_connection->query($sql);
 
-}
-elseif (isset($_POST['edit'])) {
+} elseif (isset($_POST['edit'])) {
     if (isset($_POST['sql_host'])) {
         if ($_SESSION['permissions']['super_admin']) {
             if (formtoken::validateToken($_POST)) {
@@ -32,8 +31,12 @@ 
                     $sql = "UPDATE `servers` SET `name`= '" . $name . "',`type`= '" . $type . "',`use_sq`= '" . $usegsq . "' WHERE `dbid`='" . $id . "';";
                 }
                 $result_of_query = $db_connection->query($sql);
-            } else message($lang['expired']);
-        } else logAction($_SESSION['user_name'], $lang['failedUpdate'] . ' ' . $lang['gsq'], 3);
+            } else {
+                message($lang['expired']);
+            }
+        } else {
+            logAction($_SESSION['user_name'], $lang['failedUpdate'] . ' ' . $lang['gsq'], 3);
+        }
     }
 }
     $sql = "SELECT * FROM `servers` WHERE `dbid`='" . $id . "';";
@@ -116,7 +119,12 @@ 
 
 <script>
 $(document).ready(function() {
-if (<?php if ($server->usegsq == 1) echo 'false'; else echo 'true'; ?>) {
+if (<?php if ($server->usegsq == 1) {
+    echo 'false';
+} else {
+    echo 'true';
+}
+?>) {
     $("#sq_details").hide();
 };
 $("#usegsq").change(function () {

Spacing +23 added lines, -23 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 $id = clean($id, "int");
 if (isset($_POST['del']) && $id != 1) {
-    $sql = "DELETE FROM `db` WHERE `dbid`='" . $id . "';";
+    $sql = "DELETE FROM `db` WHERE `dbid`='".$id."';";
     $result_of_query = $db_connection->query($sql);
-    $sql = "DELETE FROM `servers` WHERE `dbid`='" . $id . "';";
+    $sql = "DELETE FROM `servers` WHERE `dbid`='".$id."';";
     $result_of_query = $db_connection->query($sql);
 
 }
@@ -16,7 +16,7 @@ 
                 $pass = encrypt(clean($_POST['sql_pass'], "string"));
                 $name = encrypt(clean($_POST['sql_name'], "string"));
 
-                $sql = "UPDATE `db` SET `sql_host` = '" . $host . "',`sql_name` = '" . $name . "',`sql_pass` = '" . $pass . "',`sql_user` = '" . $user . "' WHERE `dbid`='" . $id . "';";
+                $sql = "UPDATE `db` SET `sql_host` = '".$host."',`sql_name` = '".$name."',`sql_pass` = '".$pass."',`sql_user` = '".$user."' WHERE `dbid`='".$id."';";
                 $result_of_query = $db_connection->query($sql);
 
                 $type = clean($_POST['type'], "string");
@@ -27,21 +27,21 @@ 
                     $sq_ip = encrypt(clean($_POST['sq_ip'], "string"));
                     $sq_port = encrypt(clean($_POST['sq_port'], "string"));
                     $rcon_pass = encrypt(clean($_POST['rcon_pass'], "string"));
-                    $sql = "UPDATE `servers` SET `name`= '" . $name . "',`type`= '" . $type . "',`use_sq`= '" . $usegsq . "',`sq_port`= '" . $sq_port . "',`sq_ip`= '" . $sq_ip . "',`rcon_pass`= '" . $rcon_pass . "' WHERE `dbid`='" . $id . "';";
+                    $sql = "UPDATE `servers` SET `name`= '".$name."',`type`= '".$type."',`use_sq`= '".$usegsq."',`sq_port`= '".$sq_port."',`sq_ip`= '".$sq_ip."',`rcon_pass`= '".$rcon_pass."' WHERE `dbid`='".$id."';";
                 } else {
-                    $sql = "UPDATE `servers` SET `name`= '" . $name . "',`type`= '" . $type . "',`use_sq`= '" . $usegsq . "' WHERE `dbid`='" . $id . "';";
+                    $sql = "UPDATE `servers` SET `name`= '".$name."',`type`= '".$type."',`use_sq`= '".$usegsq."' WHERE `dbid`='".$id."';";
                 }
                 $result_of_query = $db_connection->query($sql);
             } else message($lang['expired']);
-        } else logAction($_SESSION['user_name'], $lang['failedUpdate'] . ' ' . $lang['gsq'], 3);
+        } else logAction($_SESSION['user_name'], $lang['failedUpdate'].' '.$lang['gsq'], 3);
     }
 }
-    $sql = "SELECT * FROM `servers` WHERE `dbid`='" . $id . "';";
+    $sql = "SELECT * FROM `servers` WHERE `dbid`='".$id."';";
     $result_of_query = $db_connection->query($sql);
 
     if ($result_of_query->num_rows == 1) {
         $server = $result_of_query->fetch_object();
-        $sql = "SELECT `sql_host`,`dbid`,`sql_name`,`sql_pass`,`sql_user` FROM `db` WHERE `dbid`='" . $id . "';";
+        $sql = "SELECT `sql_host`,`dbid`,`sql_name`,`sql_pass`,`sql_user` FROM `db` WHERE `dbid`='".$id."';";
         $result = $db_connection->query($sql);
         if ($result->num_rows == 1) {
             $db = $result->fetch_object();
@@ -59,45 +59,45 @@ 
     <form method='post' action='<?php echo $settings['url'] ?>editServer/<?php echo $id ?>' id='updateServer' name='updateServer'>
         <div class="col-md-6">
             <?php
-            echo "<h3>" . $lang['database'] . "</h3>";
-            echo "<div class='form-group'><label for='sql_host'>" . $lang['database'] . " " . $lang['host'] . ": </label><input class='form-control' id='sql_host' type='text' name='sql_host' value='" . decrypt($db->sql_host) . "'></div>";
-            echo "<div class='form-group'><label for='sql_user'>" . $lang['database'] . " " . $lang['user'] . ": </label><input class='form-control' id='sql_user' type='text' name='sql_user' value='" . decrypt($db->sql_user) . "'></div>";
-            echo "<div class='form-group'><div class='input-group'><label for='sql_pass'>" . $lang['database'] . " " . $lang['password'] . ": </label><input class='form-control pwd' id='sql_pass' type='password' name='sql_pass' value='" . decrypt($db->sql_pass) . "'>";
+            echo "<h3>".$lang['database']."</h3>";
+            echo "<div class='form-group'><label for='sql_host'>".$lang['database']." ".$lang['host'].": </label><input class='form-control' id='sql_host' type='text' name='sql_host' value='".decrypt($db->sql_host)."'></div>";
+            echo "<div class='form-group'><label for='sql_user'>".$lang['database']." ".$lang['user'].": </label><input class='form-control' id='sql_user' type='text' name='sql_user' value='".decrypt($db->sql_user)."'></div>";
+            echo "<div class='form-group'><div class='input-group'><label for='sql_pass'>".$lang['database']." ".$lang['password'].": </label><input class='form-control pwd' id='sql_pass' type='password' name='sql_pass' value='".decrypt($db->sql_pass)."'>";
             echo "<span class='input-group-btn'><button style='margin-top: 23px; background-color: #eee;' ";
             echo "class='btn btn-default reveal' type='button'><i class='fa fa-eye-slash'></i></button></span></div></div>";
-            echo "<div class='form-group'><label for='sql_name'>" . $lang['database'] . " " . $lang['name'] . ": </label><input class='form-control' id='sql_name' type='text' name='sql_name' value='" . decrypt($db->sql_name) . "'></div>";
-            echo "<div class='form-group'><label for='name'>" . $lang['name'] . ": </label><input class='form-control' id='name' type='text' name='name' value='" . $server->name . "'></div>";
+            echo "<div class='form-group'><label for='sql_name'>".$lang['database']." ".$lang['name'].": </label><input class='form-control' id='sql_name' type='text' name='sql_name' value='".decrypt($db->sql_name)."'></div>";
+            echo "<div class='form-group'><label for='name'>".$lang['name'].": </label><input class='form-control' id='name' type='text' name='name' value='".$server->name."'></div>";
             ?>
-            <div class='form-group'><label for="type"><?php echo $lang['database'] . " " . $lang['type'] ?>: </label>
+            <div class='form-group'><label for="type"><?php echo $lang['database']." ".$lang['type'] ?>: </label>
                 <select name="type" id="type" class="form-control">
                     <option value="life"
-                    <?php echo select('life', $server->type) . '>' . $lang['life'] ?></option>
+                    <?php echo select('life', $server->type).'>'.$lang['life'] ?></option>
                     <option value="waste"
-                    <?php echo select('waste', $server->type) . '>' . $lang['waste'] ?></option>
+                    <?php echo select('waste', $server->type).'>'.$lang['waste'] ?></option>
                 </select>
             </div>
         </div>
         <div class="col-md-6" style="float:right;">
                 <h3><?php echo $lang['gsq'] ?></h3>
-                <div class='form-group'><label for="usegsq"><?php echo $lang['use'] . " " . $lang['gsq'] ?>: </label>
+                <div class='form-group'><label for="usegsq"><?php echo $lang['use']." ".$lang['gsq'] ?>: </label>
                 <select name="usegsq" id="usegsq" class="form-control">
                     <option value="1"
-                    <?php echo select('1', $server->use_sq) . '>' . $lang['yes'] ?></option>
+                    <?php echo select('1', $server->use_sq).'>'.$lang['yes'] ?></option>
                     <option value="0"
-                    <?php echo select('0', $server->use_sq) . '>' . $lang['no'] ?></option>
+                    <?php echo select('0', $server->use_sq).'>'.$lang['no'] ?></option>
                 </select>
             </div> <?php
-                echo "<div id='sq_details'><div class='form-group'><label for='sq_ip'>" . $lang['gsq'] . " " . $lang['gsqa'] . ": </label><input class='form-control' id='sq_ip' type='text' name='sq_ip' value='";
+                echo "<div id='sq_details'><div class='form-group'><label for='sq_ip'>".$lang['gsq']." ".$lang['gsqa'].": </label><input class='form-control' id='sq_ip' type='text' name='sq_ip' value='";
                 if (isset($server->sq_ip)) {
                     echo decrypt($server->sq_ip);
                 }
                 echo "'></div>";
-                echo "<div class='form-group'><label for='sq_port'>" . $lang['gsq'] . " " . $lang['gsqp'] . ": </label><input class='form-control' id='sq_port' type='text' name='sq_port' value='";
+                echo "<div class='form-group'><label for='sq_port'>".$lang['gsq']." ".$lang['gsqp'].": </label><input class='form-control' id='sq_port' type='text' name='sq_port' value='";
                 if (isset($server->sq_port)) {
                     echo decrypt($server->sq_port);
                 }
                 echo "'></div>";
-                echo "<div class='form-group'><div class='input-group'><label for='rcon_pass'>" . $lang['gsq'] . " " . $lang['gsrc'] . ": </label><input class='form-control pwd' id='rcon_pass' type='password' name='rcon_pass' value='";
+                echo "<div class='form-group'><div class='input-group'><label for='rcon_pass'>".$lang['gsq']." ".$lang['gsrc'].": </label><input class='form-control pwd' id='rcon_pass' type='password' name='rcon_pass' value='";
                 if (isset($server->rcon_pass)) {
                     echo decrypt($server->rcon_pass);
                 }

views/core/pluginstore.php

Braces +16 added lines, -8 removed lines

@@ -117,24 +117,32 @@
         }
 
         $dropIn = array_diff($files, array_column($plugins, 'dirname'));
-        if ($dropIn > 0) echo "<h2 style='margin-top: 0;'>" . $lang['dropIn'] . "</h2>";
+        if ($dropIn > 0) {
+            echo "<h2 style='margin-top: 0;'>" . $lang['dropIn'] . "</h2>";
+        }
         
         foreach ($dropIn as &$plugin) {
             $key = array_search($plugin, array_column($installed, 'dirname'));
             echo '<div class="col-sm-6 col-md-4"><div class="thumbnail"><div class="caption">';
             echo '<h3>' . $installed[$key]['name'] . ' - ' . $installed[$key]['version'];
 
-            if (in_array($plugin, $settings['plugins']))
-            echo '<small style="padding-left: 6px;"><span class="label label-success">' . $lang['active'] . '</span></small>';
-            else echo '<small style="padding-left: 6px;"><span class="label label-default">' . $lang['installed'] . '</span></small>';
+            if (in_array($plugin, $settings['plugins'])) {
+                        echo '<small style="padding-left: 6px;"><span class="label label-success">' . $lang['active'] . '</span></small>';
+            } else {
+                echo '<small style="padding-left: 6px;"><span class="label label-default">' . $lang['installed'] . '</span></small>';
+            }
 
             echo '</h3><p><strong>' . $installed[$key]['author'] . '</strong> - ' . $installed[$key]['description'] . '</p>';
 
-            if (in_array($plugin, $settings['plugins']))
-            echo '<p><a href="?deactivate=' . $plugin . '" class="btn btn-primary" role="button">' . $lang['deactivate'] . '</a>';
-            else echo '<p><a href="?activate=' . $plugin . '" class="btn btn-primary" role="button">' . $lang['activate'] . '</a>';
+            if (in_array($plugin, $settings['plugins'])) {
+                        echo '<p><a href="?deactivate=' . $plugin . '" class="btn btn-primary" role="button">' . $lang['deactivate'] . '</a>';
+            } else {
+                echo '<p><a href="?activate=' . $plugin . '" class="btn btn-primary" role="button">' . $lang['activate'] . '</a>';
+            }
 
-            if (isset($installed[$key]['authurl'])) echo '<a style="margin-left: 5px;" href="' . $installed[$key]['authurl'] . '" class="btn btn-default" role="button">' . $lang['visitSite'] . '</a>';
+            if (isset($installed[$key]['authurl'])) {
+                echo '<a style="margin-left: 5px;" href="' . $installed[$key]['authurl'] . '" class="btn btn-default" role="button">' . $lang['visitSite'] . '</a>';
+            }
             echo '<a style="float: right;" href="?delete=' . $plugin . '" class="btn btn-danger" role="button">' . $lang['delete'] . '</a>';
             echo '</p></div></div></div>';
         }

Spacing +35 added lines, -35 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if (file_exists("plugins")) {
-    $plugins = json_decode(file_get_contents('http://cyberbyte.org.uk/hooks/cyberworks/plugins.php?id=' . $settings['id']), true);
+    $plugins = json_decode(file_get_contents('http://cyberbyte.org.uk/hooks/cyberworks/plugins.php?id='.$settings['id']), true);
 
     function downloadFile($url) {
-        $newfname = realpath('downloading') . '/plugin.zip';
+        $newfname = realpath('downloading').'/plugin.zip';
         $folder = realpath('plugins');
         $file = fopen($url, "rb");
         if ($file) {
@@ -37,10 +37,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        rrmdir($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        rrmdir($dir."/".$object);
                     } else {
-                        unlink($dir . "/" . $object);
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -58,7 +58,7 @@ 
     if (isset($_GET['activate'])) {
         if (!in_array($_GET['activate'], $settings['plugins'])) {
             array_push($settings['plugins'], $_GET['activate']);
-            $json = json_decode(file_get_contents('plugins/' . $_GET['activate'] . '/plugin.json'), true);
+            $json = json_decode(file_get_contents('plugins/'.$_GET['activate'].'/plugin.json'), true);
             if (isset($json['language']) && isset($json['short'])) {
                 $lang = array($json['language'], $json['short']);
                 array_push($settings['installedLanguage'], $lang);
@@ -69,7 +69,7 @@ 
 
                 }
             }
-            file_put_contents('config/settings.php', '<?php return ' . var_export($settings, true) . ';');
+            file_put_contents('config/settings.php', '<?php return '.var_export($settings, true).';');
             message($lang['pluginActivated']);
         } message($lang['activeAlready']);
     }
@@ -82,17 +82,17 @@ 
                 $settings['plugins'] = array_diff($settings['plugins'], array($_GET['deactivate']));
             }
             
-            $json = json_decode(file_get_contents('plugins/' . $_GET['deactivate'] . '/plugin.json'), true);
+            $json = json_decode(file_get_contents('plugins/'.$_GET['deactivate'].'/plugin.json'), true);
             if (isset($json['language']) && isset($json['short'])) {
                 $key = array_search($_GET['deactivate'], array_column($settings['installedLanguage'], 0));
                 unset($settings['installedLanguage'][$key]);
             }
-            file_put_contents('config/settings.php', '<?php return ' . var_export($settings, true) . ';');
+            file_put_contents('config/settings.php', '<?php return '.var_export($settings, true).';');
         } message($lang['notActive']);
     }
 
     if (isset($_GET['delete'])) {
-        rrmdir(realpath('plugins') . '/' . $_GET['delete']);
+        rrmdir(realpath('plugins').'/'.$_GET['delete']);
     }
     ?>
 
@@ -112,91 +112,91 @@ 
         unset($files[1]);
 
         foreach ($files as &$file) {
-            $path = 'plugins/' . $file . '/plugin.json';
+            $path = 'plugins/'.$file.'/plugin.json';
             $installed[] = json_decode(file_get_contents($path), true);
         }
 
         $dropIn = array_diff($files, array_column($plugins, 'dirname'));
-        if ($dropIn > 0) echo "<h2 style='margin-top: 0;'>" . $lang['dropIn'] . "</h2>";
+        if ($dropIn > 0) echo "<h2 style='margin-top: 0;'>".$lang['dropIn']."</h2>";
         
         foreach ($dropIn as &$plugin) {
             $key = array_search($plugin, array_column($installed, 'dirname'));
             echo '<div class="col-sm-6 col-md-4"><div class="thumbnail"><div class="caption">';
-            echo '<h3>' . $installed[$key]['name'] . ' - ' . $installed[$key]['version'];
+            echo '<h3>'.$installed[$key]['name'].' - '.$installed[$key]['version'];
 
             if (in_array($plugin, $settings['plugins']))
-            echo '<small style="padding-left: 6px;"><span class="label label-success">' . $lang['active'] . '</span></small>';
-            else echo '<small style="padding-left: 6px;"><span class="label label-default">' . $lang['installed'] . '</span></small>';
+            echo '<small style="padding-left: 6px;"><span class="label label-success">'.$lang['active'].'</span></small>';
+            else echo '<small style="padding-left: 6px;"><span class="label label-default">'.$lang['installed'].'</span></small>';
 
-            echo '</h3><p><strong>' . $installed[$key]['author'] . '</strong> - ' . $installed[$key]['description'] . '</p>';
+            echo '</h3><p><strong>'.$installed[$key]['author'].'</strong> - '.$installed[$key]['description'].'</p>';
 
             if (in_array($plugin, $settings['plugins']))
-            echo '<p><a href="?deactivate=' . $plugin . '" class="btn btn-primary" role="button">' . $lang['deactivate'] . '</a>';
-            else echo '<p><a href="?activate=' . $plugin . '" class="btn btn-primary" role="button">' . $lang['activate'] . '</a>';
+            echo '<p><a href="?deactivate='.$plugin.'" class="btn btn-primary" role="button">'.$lang['deactivate'].'</a>';
+            else echo '<p><a href="?activate='.$plugin.'" class="btn btn-primary" role="button">'.$lang['activate'].'</a>';
 
-            if (isset($installed[$key]['authurl'])) echo '<a style="margin-left: 5px;" href="' . $installed[$key]['authurl'] . '" class="btn btn-default" role="button">' . $lang['visitSite'] . '</a>';
-            echo '<a style="float: right;" href="?delete=' . $plugin . '" class="btn btn-danger" role="button">' . $lang['delete'] . '</a>';
+            if (isset($installed[$key]['authurl'])) echo '<a style="margin-left: 5px;" href="'.$installed[$key]['authurl'].'" class="btn btn-default" role="button">'.$lang['visitSite'].'</a>';
+            echo '<a style="float: right;" href="?delete='.$plugin.'" class="btn btn-danger" role="button">'.$lang['delete'].'</a>';
             echo '</p></div></div></div>';
         }
-        echo "<div class='row'></div><h2>" . $lang['pluginstore'] . "</h2>";
+        echo "<div class='row'></div><h2>".$lang['pluginstore']."</h2>";
 
         foreach ($plugins as &$plugin) {
             echo '<div class="col-sm-6 col-md-4"><div class="thumbnail">';
-            echo '<img  src="' . $plugin['image'] . '" alt="' . $plugin['name'] . '">';
+            echo '<img  src="'.$plugin['image'].'" alt="'.$plugin['name'].'">';
             echo '<div class="caption">';
-            echo '<h3>' . $plugin['name'] . ' - ' . $plugin['version'];
+            echo '<h3>'.$plugin['name'].' - '.$plugin['version'];
 
             $key = array_search($plugin['dirname'], array_column($installed, 'dirname'));
 
             if ($key !== false) {
                 if (in_array($plugin['dirname'], $settings['plugins'])) {
                     if ($plugin['version'] > $installed[$key]['version']) {
-                        echo '<small style="padding-left: 6px;"><span class="label label-info">' . $lang['updateAvalible'] . '</span></small>';
+                        echo '<small style="padding-left: 6px;"><span class="label label-info">'.$lang['updateAvalible'].'</span></small>';
                     }
                     // Update avalible
                     else {
-                        echo '<small style="padding-left: 6px;"><span class="label label-success">' . $lang['active'] . '</span>';
+                        echo '<small style="padding-left: 6px;"><span class="label label-success">'.$lang['active'].'</span>';
                     }
                     // Active plugin
                 } elseif (in_array($plugin['dirname'], $files)) {
-                    echo '<small style="padding-left: 6px;"><span class="label label-default">' . $lang['installed'] . '</span></small>';
+                    echo '<small style="padding-left: 6px;"><span class="label label-default">'.$lang['installed'].'</span></small>';
                 }
                 // Installed not active
             }
-            echo '</h3><p><strong>' . $plugin['author'] . '</strong> - ' . $plugin['description'] . '</p>';
+            echo '</h3><p><strong>'.$plugin['author'].'</strong> - '.$plugin['description'].'</p>';
 
             if ($key !== false) {
                 if (in_array($plugin['dirname'], $settings['plugins'])) {
                     if ($plugin['version'] > $installed[$key]['version']) {
-                        echo '<div><a href="?install=' . $plugin['dirname'] . '" class="btn btn-primary" role="button">' . $lang['update'] . '</a>';
+                        echo '<div><a href="?install='.$plugin['dirname'].'" class="btn btn-primary" role="button">'.$lang['update'].'</a>';
                     }
                     // Update avalible
                     else {
-                        echo '<p><a href="?deactivate=' . $plugin['dirname'] . '" class="btn btn-primary" role="button">' . $lang['deactivate'] . '</a>';
+                        echo '<p><a href="?deactivate='.$plugin['dirname'].'" class="btn btn-primary" role="button">'.$lang['deactivate'].'</a>';
                     }
                     // Active plugin
                 } elseif (in_array($plugin['dirname'], $files)) {
-                    echo '<p><a href="?activate=' . $plugin['dirname'] . '" class="btn btn-primary" role="button">' . $lang['activate'] . '</a>';
+                    echo '<p><a href="?activate='.$plugin['dirname'].'" class="btn btn-primary" role="button">'.$lang['activate'].'</a>';
                 }
                 // Installed not active
             } else {
-                echo '<p><a href="?install=' . $plugin['dirname'] . '" class="btn btn-primary" role="button">' . $lang['install'] . '</a>';
+                echo '<p><a href="?install='.$plugin['dirname'].'" class="btn btn-primary" role="button">'.$lang['install'].'</a>';
             }
             // Not installed
 
             if (isset($plugin['authurl'])) {
-                echo '<a style="margin-left: 5px;" href="' . $plugin['authurl'] . '" class="btn btn-default" role="button">' . $lang['visitSite'] . '</a>';
+                echo '<a style="margin-left: 5px;" href="'.$plugin['authurl'].'" class="btn btn-default" role="button">'.$lang['visitSite'].'</a>';
             }
             if (in_array($plugin['dirname'], $files)) {
-                echo '<a style="float: right;" href="?delete=' . $plugin['dirname'] . '" class="btn btn-danger" role="button">' . $lang['delete'] . '</a></div>';
+                echo '<a style="float: right;" href="?delete='.$plugin['dirname'].'" class="btn btn-danger" role="button">'.$lang['delete'].'</a></div>';
             }
             echo '</div></div></div>';
         }
 
         echo '</div></div></form>';
     } else {
-        echo '<h2>' . $lang['notverified'] . '</h2>';
+        echo '<h2>'.$lang['notverified'].'</h2>';
     }
     } else {
-    echo '<h2>' . $lang['noPlugin'] . '</h2>';
+    echo '<h2>'.$lang['noPlugin'].'</h2>';
 }

views/core/newServer.php

Braces +3 added lines, -1 removed lines

@@ -75,7 +75,8 @@ 
                     <input placeholder="SQ IP" id="server_SQ_host"
                        class=" form-control login_input" type="text"
                        name="server_SQ_host"
-                        <?php if (isset($_POST['server_SQ_host'])) echo 'value="' . $_POST['server_SQ_host'] . '"' ?> autocorrect="off" autocapitalize="off">
+                        <?php if (isset($_POST['server_SQ_host'])) {
+    echo 'value="' . $_POST['server_SQ_host'] . '"' ?> autocorrect="off" autocapitalize="off">
                     </div>
                     <div class="form-group">
                         <label for="server_SQ_port">SQ port: </label>
@@ -93,6 +94,7 @@ 
                             <?php
                 $sql = "SELECT `dbid`,`sql_name` FROM `db`;";
 }
+}
                 $result_of_query = $db_connection->query($sql);
                 if ($result_of_query->num_rows >= 1) {
                     echo '<div class="form-group"><label for="server_dbid">Database: </label>';

Spacing +10 added lines, -10 removed lines

@@ -5,10 +5,10 @@ 
         if ($dbid == 'none') {
             $server_type = 'life';
 
-            $sql = "INSERT INTO `db` (`type`, `sql_host`, `sql_user`, `sql_pass`, `sql_name`) VALUES ('" . $server_type . "', '" . $settings['db']['host'] . "', '" . $settings['db']['user'] . "', '" . $settings['db']['pass'] . "', '" . $settings['db']['name'] . "');";
+            $sql = "INSERT INTO `db` (`type`, `sql_host`, `sql_user`, `sql_pass`, `sql_name`) VALUES ('".$server_type."', '".$settings['db']['host']."', '".$settings['db']['user']."', '".$settings['db']['pass']."', '".$settings['db']['name']."');";
             $result_of_query = $db_connection->query($sql);
 
-            $sql = "SELECT `dbid` FROM `db` WHERE `sql_name` = '" . $SQL_name . "';";
+            $sql = "SELECT `dbid` FROM `db` WHERE `sql_name` = '".$SQL_name."';";
             $result_of_query = $db_connection->query($sql);
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 $dbid = $row['dbid'];
@@ -27,11 +27,11 @@ 
                 $server_RCON_pass = encrypt($_POST['server_RCON_pass']);
 
                 $sql = "INSERT INTO `servers` (`name`, `dbid`, `type`, `use_sq`, `sq_port`,`sq_ip`, `rcon_pass`) VALUES
-                ('" . $server_name . "', '" . $dbid . "', '" . $server_type . "', '" . $server_SQ . "', '" . $server_SQ_port . "', '" . $server_SQ_host . "', '" . $server_RCON_pass . "');";
+                ('" . $server_name."', '".$dbid."', '".$server_type."', '".$server_SQ."', '".$server_SQ_port."', '".$server_SQ_host."', '".$server_RCON_pass."');";
             }
         } else {
             $sql = "INSERT INTO `servers` (`name`, `dbid`, `type`, `use_sq`) VALUES
-                ('" . $server_name . "', '" . $dbid . "', '" . $server_type . "', '" . $server_SQ . "');";
+                ('" . $server_name."', '".$dbid."', '".$server_type."', '".$server_SQ."');";
         }
 
         $result_of_query = $db_connection->query($sql);
@@ -46,13 +46,13 @@ 
         <form method="post" action="newServer" name="newServer" id="newServer">
             <?php echo formtoken::getField() ?>
             <h2 class="form-login-heading">
-                <?php echo $lang['new'] . ' ' . $lang['gameServers'] ?>
+                <?php echo $lang['new'].' '.$lang['gameServers'] ?>
             </h2>
             <div class="form-group">
                 <label for="server_name">Server Name: </label>
                 <input placeholder="Server Name" id="server_name" class=" form-control login_input" type="text" name="server_name"
                     <?php if (isset($_POST['server_name'])) {
-    echo 'value="' . $_POST['server_name'] . '"' ?>
+    echo 'value="'.$_POST['server_name'].'"' ?>
                        autocorrect="off" required>
                 </div>
                 <div class="form-group">
@@ -75,19 +75,19 @@ 
                     <input placeholder="SQ IP" id="server_SQ_host"
                        class=" form-control login_input" type="text"
                        name="server_SQ_host"
-                        <?php if (isset($_POST['server_SQ_host'])) echo 'value="' . $_POST['server_SQ_host'] . '"' ?> autocorrect="off" autocapitalize="off">
+                        <?php if (isset($_POST['server_SQ_host'])) echo 'value="'.$_POST['server_SQ_host'].'"' ?> autocorrect="off" autocapitalize="off">
                     </div>
                     <div class="form-group">
                         <label for="server_SQ_port">SQ port: </label>
                         <input placeholder="SQ Port" id="server_SQ_port"
                        class=" form-control login_input" type="text"
                        name="server_SQ_port"
-                            <?php if (isset($_POST['server_SQ_port'])) echo 'value="' . $_POST['server_SQ_port'] . '"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
+                            <?php if (isset($_POST['server_SQ_port'])) echo 'value="'.$_POST['server_SQ_port'].'"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
                         </div>
                         <div class="form-group">
                             <label for="server_RCON_pass">RCON Password: </label>
                             <input placeholder="RCON Password" id="server_RCON_pass" class=" form-control login_input" type="password" name="server_RCON_pass"
-                                <?php if (isset($_POST['server_RCON_pass'])) echo 'value="' . $_POST['server_RCON_pass'] . '"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
+                                <?php if (isset($_POST['server_RCON_pass'])) echo 'value="'.$_POST['server_RCON_pass'].'"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
                             </div>
                             </div>
                             <?php
@@ -98,7 +98,7 @@ 
                     echo '<div class="form-group"><label for="server_dbid">Database: </label>';
                     echo '<select id="server_dbid" name="server_dbid" class="form-control login_input">';
                     while ($row = mysqli_fetch_assoc($result_of_query)) {
-                        echo '<option value="' . $row['dbid'] . '">' . decrypt($row['sql_name'], $settings['key']) . '</option>';
+                        echo '<option value="'.$row['dbid'].'">'.decrypt($row['sql_name'], $settings['key']).'</option>';
                     }
                     echo '</select></div>';
                 } else {

views/core/profile.php

Braces +7 added lines, -2 removed lines

@@ -103,7 +103,10 @@ 
                     invalid: 'fa fa-times',
                     validating: 'fa fa-refresh'
                 },
-                locale: '<?php if (isset($_SESSION['forum_lang'])) echo $_SESSION['forum_lang']; else echo 'en_US' ?>',
+                locale: '<?php if (isset($_SESSION['forum_lang'])) {
+    echo $_SESSION['forum_lang'];
+} else {
+    echo 'en_US' ?>',
                 fields: {
                     email: {
                         validators: {
@@ -131,7 +134,9 @@ 
                                 regexp: /^\d{15,25}$/
                             },
                             remote: {
-                                url: '<?php echo $settings['url']; ?>validators/pid.php',
+                                url: '<?php echo $settings['url'];
+}
+?>validators/pid.php',
                                 type: 'POST',
                                 message: '<?php echo $lang['failPID'] ?>'
                             }

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
         $user_pic = $_POST['user_pic'];
         $pId = $_POST['player_id'];
         $_SESSION['user_profile'] = $user_pic;
-        $sql = "UPDATE `users` SET `user_email`= '" . $email . "',`playerid`= '" . $pId . "', `user_profile`= '" . $user_pic . "'WHERE `user_id` = '" . $_SESSION['user_id'] . "' ";
+        $sql = "UPDATE `users` SET `user_email`= '".$email."',`playerid`= '".$pId."', `user_profile`= '".$user_pic."'WHERE `user_id` = '".$_SESSION['user_id']."' ";
         $result_of_query = $db_connection->query($sql);
     } else {
         message($lang['expired']);
@@ -13,10 +13,10 @@ 
 }
 if (isset($_POST['user_password'])) {
     if (formtoken::validateToken($_POST)) {
-        $sql = "SELECT `user_password_hash` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+        $sql = "SELECT `user_password_hash` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
         $result = $db_connection->query($sql)->fetch_object();
-        if ($_POST['user_password'] == $_POST['user_password_again'] && password_verify($_POST['current_password'],$result->user_password_hash)) {
-            $sql = "UPDATE `users` SET `user_password_hash`= '" . password_hash($_POST['user_password'], PASSWORD_DEFAULT) . "' WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+        if ($_POST['user_password'] == $_POST['user_password_again'] && password_verify($_POST['current_password'], $result->user_password_hash)) {
+            $sql = "UPDATE `users` SET `user_password_hash`= '".password_hash($_POST['user_password'], PASSWORD_DEFAULT)."' WHERE `user_id` = '".$_SESSION['user_id']."';";
             $result_of_query = $db_connection->query($sql);
             message($lang['passChanged']);
         }
@@ -25,7 +25,7 @@ 
     }
 }
 
-$sql = "SELECT * FROM `users` WHERE `user_name` ='" . $_SESSION['user_name'] . "';";
+$sql = "SELECT * FROM `users` WHERE `user_name` ='".$_SESSION['user_name']."';";
 $profile = $db_connection->query($sql)->fetch_object();
 ?>
 <div class="row">
@@ -44,14 +44,14 @@ 
     <div class="panel-body">
         <div class="row">
             <div  style="padding-top:4%;" class="col-md-3 col-lg-3 " align="center">
-                <?php if(!isset($_SESSION['profile_link'])) {
-                    if(isset($_SESSION['user_email']) && $settings['gravatar']) { ?>
-                        <a href="<?php echo $settings['url'] . 'profile' ?>"> <img alt="User Pic" src="<?php getGravatar($_SESSION['user_email'],64,'retro')  ?>" class="img-circle img-responsive"></a>
+                <?php if (!isset($_SESSION['profile_link'])) {
+                    if (isset($_SESSION['user_email']) && $settings['gravatar']) { ?>
+                        <a href="<?php echo $settings['url'].'profile' ?>"> <img alt="User Pic" src="<?php getGravatar($_SESSION['user_email'], 64, 'retro')  ?>" class="img-circle img-responsive"></a>
                     <?php } else {?>
-                        <a href="<?php echo $settings['url'] . 'profile' ?>"> <img alt="User Pic" src="<?php echo $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg' ?>" class="img-circle img-responsive"></a>
+                        <a href="<?php echo $settings['url'].'profile' ?>"> <img alt="User Pic" src="<?php echo $settings['url'].'assets/img/profile/'.$_SESSION['user_profile'].'.jpg' ?>" class="img-circle img-responsive"></a>
                     <?php } ?>
                 <?php } else { ?>
-                    <img alt="User Pic" src="<?php echo $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg' ?>" class="img-circle img-responsive">
+                    <img alt="User Pic" src="<?php echo $settings['url'].'assets/img/profile/'.$_SESSION['user_profile'].'.jpg' ?>" class="img-circle img-responsive">
                 <?php } ?>
             </div>
 
@@ -60,7 +60,7 @@ 
                     <tbody>
                     <tr>
                         <td><?php echo $lang['rank'] ?>:</td>
-                        <td><?php echo $settings['ranks'][$profile->user_level] . " (" . $profile->user_level . ")" ?></td>
+                        <td><?php echo $settings['ranks'][$profile->user_level]." (".$profile->user_level.")" ?></td>
                     </tr>
                     <form method="post" action="profile" name="profileEdit" id="profileEdit">
                         <?php echo formtoken::getField(); ?>
@@ -78,26 +78,26 @@ 
                                 <select id='user_pic' name='user_pic' class='form-control'>";
                                     <?php
                                     for ($icon = 1; $icon < 6; $icon++) {
-                                        echo '<option value="' . $icon . '" ' . select($icon, $profile->user_profile) . '>' . $settings['names'][$icon] . '</option>';
+                                        echo '<option value="'.$icon.'" '.select($icon, $profile->user_profile).'>'.$settings['names'][$icon].'</option>';
                                     }
                                     ?>
                                 </select>
                             </td>
                         </tr>
                         <tr>
-                            <td><?php echo $lang['current'] . " " . $lang['password'] ?></td>
+                            <td><?php echo $lang['current']." ".$lang['password'] ?></td>
                             <td>
                                 <input type="password" id="current_password" name="current_password" class="form-control" autocorrect="off" autocapitalize="off" autocomplete="off">
                             </td>
                         </tr>
                         <tr>
-                            <td><?php echo "New " . $lang['password'] ?></td>
+                            <td><?php echo "New ".$lang['password'] ?></td>
                             <td>
                                 <input type="password" id="user_password" name="user_password" class="form-control" autocorrect="off" autocapitalize="off" autocomplete="off">
                             </td>
                         </tr>
                         <tr>
-                            <td><?php echo $lang['repeat'] . " New " . $lang['password'] ?></td>
+                            <td><?php echo $lang['repeat']." New ".$lang['password'] ?></td>
                             <td>
                                 <input type="password" id="user_password_again" name="user_password_again" autocorrect="off" class="form-control" autocapitalize="off" autocomplete="off">
                             </td>

views/core/register.php

Braces +11 added lines, -3 removed lines

@@ -22,13 +22,19 @@ 
                 <p>Username:</p>
                 <input id="user_name" type="text" class="form-control"
                        placeholder="Username (only letters and numbers, 2 to 30 characters)" autofocus
-                       name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required>
+                       name="user_name" <?php if (isset($_POST['user_name'])) {
+    echo 'value="' . $_POST['user_name'] . '"';
+}
+?> required>
             </div>
 
             <div class="form-group">
                 <p>Email Address:</p>
                 <input id="user_email" placeholder="User's email" class=" form-control" type="email"
-                       name="user_email" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required/>
+                       name="user_email" <?php if (isset($_POST['user_name'])) {
+    echo 'value="' . $_POST['user_name'] . '"';
+}
+?> required/>
             </div>
             <div class="form-group">
                 <p>Password:</p>
@@ -47,7 +53,9 @@ 
                 <select class=" form-control" name="profile_pic">
                     <?php for ($icon = 1; $icon <= 6; $icon++) {
                         echo '<option value="' . $icon . '" ';
-                        if (isset($_POST['user_name'])) if ($icon == $_POST['user_name']) echo 'selected';
+                        if (isset($_POST['user_name'])) {
+                            if ($icon == $_POST['user_name']) echo 'selected';
+                        }
                         echo '>' . $settings['names'][$icon] . '</option>';
                     } ?>
                 </select>

Spacing +4 added lines, -4 removed lines

@@ -22,13 +22,13 @@ 
                 <p>Username:</p>
                 <input id="user_name" type="text" class="form-control"
                        placeholder="Username (only letters and numbers, 2 to 30 characters)" autofocus
-                       name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required>
+                       name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="'.$_POST['user_name'].'"'; ?> required>
             </div>
 
             <div class="form-group">
                 <p>Email Address:</p>
                 <input id="user_email" placeholder="User's email" class=" form-control" type="email"
-                       name="user_email" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'; ?> required/>
+                       name="user_email" <?php if (isset($_POST['user_name'])) echo 'value="'.$_POST['user_name'].'"'; ?> required/>
             </div>
             <div class="form-group">
                 <p>Password:</p>
@@ -46,9 +46,9 @@ 
                 <p>Profile Picture:</p>
                 <select class=" form-control" name="profile_pic">
                     <?php for ($icon = 1; $icon <= 6; $icon++) {
-                        echo '<option value="' . $icon . '" ';
+                        echo '<option value="'.$icon.'" ';
                         if (isset($_POST['user_name'])) if ($icon == $_POST['user_name']) echo 'selected';
-                        echo '>' . $settings['names'][$icon] . '</option>';
+                        echo '>'.$settings['names'][$icon].'</option>';
                     } ?>
                 </select>
             </div>

views/firstTime.php

Braces +8 added lines, -3 removed lines

@@ -295,7 +295,8 @@ 
                             <br>
                             <label for="community_name">Community Name: </label>
                             <input placeholder="Community Name" id="community_name"
-                                   class="form-control login_input" type="text" name="community_name" <?php if (isset($_POST['community_name'])) echo 'value="' . $_POST['community_name'] . '"'?>>
+                                   class="form-control login_input" type="text" name="community_name" <?php if (isset($_POST['community_name'])) {
+    echo 'value="' . $_POST['community_name'] . '"'?>>
                             <br><h4>User Setup</h4>
                             <label for="user_name">Username: </label>
                             <input placeholder="Username" id="user_name"
@@ -317,10 +318,14 @@ 
 
                             <select id='user_pic' name='user_pic' class=" form-control login_input">
                             <?php
-                            for ($icon = 1; $icon < 7; $icon++) {
+                            for ($icon = 1;
+}
+$icon < 7; $icon++) {
                                 echo '<option value="' . $icon . '"';
                                 if (isset($_POST['user_pic'])) {
-                                    if ($icon == $_POST['user_pic']) echo ' selected';
+                                    if ($icon == $_POST['user_pic']) {
+                                        echo ' selected';
+                                    }
                                 }
                                 echo '>' . $icon . '</option>';
                             } ?>

Spacing +51 added lines, -51 removed lines

@@ -6,7 +6,7 @@ 
     $max = ceil($length / 40);
     $random = '';
     for ($i = 0; $i < $max; $i++) {
-        $random .= sha1(microtime(true) . mt_rand(10000, 90000));
+        $random .= sha1(microtime(true).mt_rand(10000, 90000));
     }
     return substr($random, 0, $length);
 }
@@ -22,16 +22,16 @@ 
 }
 
 if (isset($_POST['user_name'])) {
-    $last = str_replace(strrchr($_SERVER['REQUEST_URI'], '/'), '', $_SERVER['REQUEST_URI']) . '/';
-    $settings['url'] = 'http://' . $_SERVER['HTTP_HOST'] . $last;
+    $last = str_replace(strrchr($_SERVER['REQUEST_URI'], '/'), '', $_SERVER['REQUEST_URI']).'/';
+    $settings['url'] = 'http://'.$_SERVER['HTTP_HOST'].$last;
     $base = substr($last, 1);
     $settings['base'] = substr_count($settings['url'], "/") - 2;
 
     $hta = 'RewriteEngine On
-RewriteBase /'.$base . '
+RewriteBase /'.$base.'
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule . /'.$base . 'index.php [L]';
-    file_put_contents('.htaccess',$hta);
+RewriteRule . /'.$base.'index.php [L]';
+    file_put_contents('.htaccess', $hta);
 
     $settings['id'] = 1001;
     $settings['community'] = $_POST['community_name'];
@@ -111,21 +111,21 @@ 
     $settings['communityBansTest'] = false;
     $settings['communityBansAPI'] = '';
 
-    $settings['item'] = array(5,10,15,25,50);
+    $settings['item'] = array(5, 10, 15, 25, 50);
 
-    $settings['installedLanguage']=array();
-    $langEn = array('English','en');
-    $langDe = array('German','de');
+    $settings['installedLanguage'] = array();
+    $langEn = array('English', 'en');
+    $langDe = array('German', 'de');
     array_push($settings['installedLanguage'], $langEn);
     array_push($settings['installedLanguage'], $langDe);
 
     $settings['names'] = array('', 'Dave', 'Sam', 'Joe', 'Kerry', 'Connie', 'Jess');
-    $settings['ranks'] = array('Banned','Player','Member','Moderator','Server Admin','Super Admin');
+    $settings['ranks'] = array('Banned', 'Player', 'Member', 'Moderator', 'Server Admin', 'Super Admin');
 
     $permissions = include 'config/permissions.php';
     $userPerms = json_encode($permissions['5']);
 
-    $link = mysqli_connect($server_SQL_host,$server_SQL_user,$server_SQL_pass,$server_SQL_name);
+    $link = mysqli_connect($server_SQL_host, $server_SQL_user, $server_SQL_pass, $server_SQL_name);
     if (mysqli_connect_errno()) {
         printf("Connect failed: %s\n", mysqli_connect_error());
         exit();
@@ -133,31 +133,31 @@ 
 
     $user_password_hash = password_hash($user_password, PASSWORD_DEFAULT);
 
-    mysqli_query($link, "USE `" . $server_SQL_name . "`;") or die('LINK: ' . mysqli_error($link));
+    mysqli_query($link, "USE `".$server_SQL_name."`;") or die('LINK: '.mysqli_error($link));
 
-    $query = mysqli_query($link, "SHOW TABLES LIKE 'users'") or die('TEST 1: ' . mysqli_error($link));
+    $query = mysqli_query($link, "SHOW TABLES LIKE 'users'") or die('TEST 1: '.mysqli_error($link));
     if (mysqli_num_rows($query) == 1) {
-        mysqli_query($link, "DROP TABLE `users`") or die('DROP 1: ' . mysqli_error($link));
+        mysqli_query($link, "DROP TABLE `users`") or die('DROP 1: '.mysqli_error($link));
     }
 
-    $query = mysqli_query($link, "SHOW TABLES LIKE 'notes'") or die('TEST 2: ' . mysqli_error($link));
+    $query = mysqli_query($link, "SHOW TABLES LIKE 'notes'") or die('TEST 2: '.mysqli_error($link));
     if (mysqli_num_rows($query) == 1) {
-        mysqli_query($link, "DROP TABLE `notes`") or die('DROP 2: ' . mysqli_error($link));
+        mysqli_query($link, "DROP TABLE `notes`") or die('DROP 2: '.mysqli_error($link));
     }
 
-    $query = mysqli_query($link, "SHOW TABLES LIKE 'db'") or die('TEST 3: ' . mysqli_error($link));
+    $query = mysqli_query($link, "SHOW TABLES LIKE 'db'") or die('TEST 3: '.mysqli_error($link));
     if (mysqli_num_rows($query) == 1) {
-        mysqli_query($link, "DROP TABLE `db`") or die('DROP 3: ' . mysqli_error($link));
+        mysqli_query($link, "DROP TABLE `db`") or die('DROP 3: '.mysqli_error($link));
     }
 
-    $query = mysqli_query($link, "SHOW TABLES LIKE 'servers'") or die('TEST 4: ' . mysqli_error($link));
+    $query = mysqli_query($link, "SHOW TABLES LIKE 'servers'") or die('TEST 4: '.mysqli_error($link));
     if (mysqli_num_rows($query) == 1) {
-        mysqli_query($link, "DROP TABLE `servers`") or die('DROP 4: ' . mysqli_error($link));
+        mysqli_query($link, "DROP TABLE `servers`") or die('DROP 4: '.mysqli_error($link));
     }
 
-    $query = mysqli_query($link, "SHOW TABLES LIKE 'logs'") or die('TEST 5: ' . mysqli_error($link));
+    $query = mysqli_query($link, "SHOW TABLES LIKE 'logs'") or die('TEST 5: '.mysqli_error($link));
     if (mysqli_num_rows($query) == 1) {
-        mysqli_query($link, "DROP TABLE `logs`") or die('DROP 5: ' . mysqli_error($link));
+        mysqli_query($link, "DROP TABLE `logs`") or die('DROP 5: '.mysqli_error($link));
     }
 
     mysqli_query($link, "CREATE TABLE IF NOT EXISTS `users` (
@@ -173,19 +173,19 @@ 
   `twoFactor` VARCHAR(25) NULL,
   `backup` VARCHAR(255) NULL,
   `token` VARCHAR(64) NULL
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='user data';") or die('1: ' . mysqli_error($link));
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='user data';") or die('1: '.mysqli_error($link));
 
     if (isset($_POST['user_pid'])) {
         $user_pid = $_POST['user_pid'];
         mysqli_query($link, "INSERT INTO `users` (`user_id`, `user_name`, `user_password_hash`, `user_email`, `playerid`, `user_level`, `permissions`,
 
 `user_profile`) VALUES
-    (1, '" . $user_name . "', '" . $user_password_hash . "', '" . $user_email . "', '" . $user_pid . "', 5, '" . $userPerms . "', '" . $user_pic . "');") or die('2: ' . mysqli_error($link));
+    (1, '" . $user_name."', '".$user_password_hash."', '".$user_email."', '".$user_pid."', 5, '".$userPerms."', '".$user_pic."');") or die('2: '.mysqli_error($link));
     } else { mysqli_query($link, "INSERT INTO `users` (`user_id`, `user_name`, `user_password_hash`, `user_email`, `user_level`, `permissions`, `user_profile`) VALUES
-    (1, '" . $user_name . "', '" . $user_password_hash . "', '" . $user_email . "', 5, '" . $userPerms . "', '" . $user_pic . "');") or die('2: ' . mysqli_error($link)); }
+    (1, '" . $user_name."', '".$user_password_hash."', '".$user_email."', 5, '".$userPerms."', '".$user_pic."');") or die('2: '.mysqli_error($link)); }
 
     mysqli_query($link, "ALTER TABLE `users`
-    MODIFY `user_id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'auto incrementing user_id of each user, unique index',AUTO_INCREMENT=2;") or die('3: ' . mysqli_error($link));
+    MODIFY `user_id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'auto incrementing user_id of each user, unique index',AUTO_INCREMENT=2;") or die('3: '.mysqli_error($link));
 
     mysqli_query($link, "CREATE TABLE IF NOT EXISTS `notes` (
 	  `note_id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'auto incrementing note_id of each user, unique index',
@@ -195,7 +195,7 @@ 
 	  `note_updated` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	  PRIMARY KEY (`note_id`),
 	  UNIQUE KEY `note_id` (`note_id`)
-    ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;") or die('4: ' . mysqli_error($link));
+    ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;") or die('4: '.mysqli_error($link));
 
     mysqli_query($link, "CREATE TABLE IF NOT EXISTS `db` (
     `dbid` INT(11) NOT NULL AUTO_INCREMENT,
@@ -206,10 +206,10 @@ 
     `sql_name` VARCHAR(64) NOT NULL,
 	PRIMARY KEY (dbid),
 	UNIQUE KEY `dbid` (`dbid`)
-    ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;") or die('5: ' . mysqli_error($link));
+    ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;") or die('5: '.mysqli_error($link));
 
     mysqli_query($link, "INSERT INTO `db` (`type`, `sql_host`, `sql_user`, `sql_pass`, `sql_name`) VALUES
-    ('" . $sql_type . "', '" . $encrypted_SQL_host . "', '" . $encrypted_SQL_user . "', '" . $encrypted_SQL_pass . "', '" . $encrypted_SQL_name . "');") or die ('6: ' . mysqli_error($link));
+    ('" . $sql_type."', '".$encrypted_SQL_host."', '".$encrypted_SQL_user."', '".$encrypted_SQL_pass."', '".$encrypted_SQL_name."');") or die ('6: '.mysqli_error($link));
 
     mysqli_query($link, "CREATE TABLE IF NOT EXISTS `servers` (
     `sid` INT(2) NOT NULL AUTO_INCREMENT,
@@ -222,16 +222,16 @@ 
     `rcon_pass` VARCHAR(255) NULL,
 	PRIMARY KEY (`sid`),
 	UNIQUE KEY `sid` (`sid`)
-    ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;") or die('7: ' . mysqli_error($link));
+    ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;") or die('7: '.mysqli_error($link));
 
     if ($server_use_SQ == '1') {
         mysqli_query($link, "INSERT INTO `servers` (`name`, `dbid`, `type`, `use_sq`, `sq_port`, `sq_ip`,`rcon_pass`) VALUES
-    ('" . $server_name . "', '1', '" . $server_type . "', '" . $server_use_SQ . "', '" . $server_PORT . "', '" . $server_IP . "', '" . $server_RCON . "');") or die
+    ('" . $server_name."', '1', '".$server_type."', '".$server_use_SQ."', '".$server_PORT."', '".$server_IP."', '".$server_RCON."');") or die
 
-('8: ' . mysqli_error($link));
+('8: '.mysqli_error($link));
     } else {
                 mysqli_query($link, "INSERT INTO `servers` (`name`, `dbid`, `type`, `use_sq`) VALUES
-    ('" . $server_name . "', '1', '" . $server_type . "', '" . $server_use_SQ . "');") or die('8: ' . mysqli_error($link));
+    ('" . $server_name."', '1', '".$server_type."', '".$server_use_SQ."');") or die('8: '.mysqli_error($link));
     }
 
     mysqli_query($link, "CREATE TABLE IF NOT EXISTS `logs` (
@@ -243,11 +243,11 @@ 
     PRIMARY KEY (`logid`),
     UNIQUE KEY `logid` (`logid`),
     KEY `logid_2` (`logid`)
-    ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;") or die('9: ' . mysqli_error($link));
+    ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;") or die('9: '.mysqli_error($link));
 
     mysqli_close($link);
 
-    file_put_contents('config/settings.php', '<?php return ' . var_export($settings, true) . ';');
+    file_put_contents('config/settings.php', '<?php return '.var_export($settings, true).';');
     $settings = include 'config/settings.php';
 
     header("Location: index?setup=1");
@@ -294,34 +294,34 @@ 
                             <br>
                             <label for="community_name">Community Name: </label>
                             <input placeholder="Community Name" id="community_name"
-                                   class="form-control login_input" type="text" name="community_name" <?php if (isset($_POST['community_name'])) echo 'value="' . $_POST['community_name'] . '"'?>>
+                                   class="form-control login_input" type="text" name="community_name" <?php if (isset($_POST['community_name'])) echo 'value="'.$_POST['community_name'].'"'?>>
                             <br><h4>User Setup</h4>
                             <label for="user_name">Username: </label>
                             <input placeholder="Username" id="user_name"
-                                   class="form-control login_input" type="text" name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="' . $_POST['user_name'] . '"'?>>
+                                   class="form-control login_input" type="text" name="user_name" <?php if (isset($_POST['user_name'])) echo 'value="'.$_POST['user_name'].'"'?>>
 
                             <label for="user_email">Email: </label>
                             <input placeholder="Email" id="user_email" class="form-control login_input"
-                                   type="email" name="user_email" required <?php if (isset($_POST['user_email'])) echo 'value="' . $_POST['user_email'] . '"'?>>
+                                   type="email" name="user_email" required <?php if (isset($_POST['user_email'])) echo 'value="'.$_POST['user_email'].'"'?>>
 
                             <label for="user_password">Password: </label>
                             <input placeholder="Password" id="user_password"
                                    class="form-control login_input" type="password" name="user_password"
-                                   autocomplete="off" required <?php if (isset($_POST['user_password'])) echo 'value="' . $_POST['user_password'] . '"'?>>
+                                   autocomplete="off" required <?php if (isset($_POST['user_password'])) echo 'value="'.$_POST['user_password'].'"'?>>
 
                             <label for="user_pid">Player ID: </label>
                             <input placeholder="Player ID" id="user_pid"
-                                   class="form-control login_input" type="number" name="user_pid" <?php if (isset($_POST['user_pid'])) echo 'value="' . $_POST['user_pid'] . '"'?>>
+                                   class="form-control login_input" type="number" name="user_pid" <?php if (isset($_POST['user_pid'])) echo 'value="'.$_POST['user_pid'].'"'?>>
                             <label for="user_pic">Picture: </label>
 
                             <select id='user_pic' name='user_pic' class=" form-control login_input">
                             <?php
                             for ($icon = 1; $icon < 7; $icon++) {
-                                echo '<option value="' . $icon . '"';
+                                echo '<option value="'.$icon.'"';
                                 if (isset($_POST['user_pic'])) {
                                     if ($icon == $_POST['user_pic']) echo ' selected';
                                 }
-                                echo '>' . $icon . '</option>';
+                                echo '>'.$icon.'</option>';
                             } ?>
                             </select>
                             <br>
@@ -336,29 +336,29 @@ 
                             <label for="server_SQL_host">SQL Host: </label>
                             <input placeholder="SQL Host" id="server_SQL_host"
                                    class="form-control login_input" type="text" name="server_SQL_host"
-                                <?php if (isset($_POST['server_SQL_host'])) echo 'value="' . $_POST['server_SQL_host'] . '"'?>>
+                                <?php if (isset($_POST['server_SQL_host'])) echo 'value="'.$_POST['server_SQL_host'].'"'?>>
 
                             <label for="server_SQL_user">SQL User: </label>
                             <input placeholder="SQL User" id="server_SQL_user"
                                    class="form-control login_input" type="text" name="server_SQL_user"
-                                <?php if (isset($_POST['server_SQL_user'])) echo 'value="' . $_POST['server_SQL_user'] . '"'?>>
+                                <?php if (isset($_POST['server_SQL_user'])) echo 'value="'.$_POST['server_SQL_user'].'"'?>>
 
                             <label for="server_SQL_pass">SQL Password: </label>
                             <input placeholder="SQL Password" id="server_SQL_pass"
                                    class="form-control login_input" type="password" name="server_SQL_pass"
-                                <?php if (isset($_POST['server_SQL_pass'])) echo 'value="' . $_POST['server_SQL_pass'] . '"'?>>
+                                <?php if (isset($_POST['server_SQL_pass'])) echo 'value="'.$_POST['server_SQL_pass'].'"'?>>
 
                             <label for="server_SQL_name">SQL Database: </label>
                             <input placeholder="SQL Database Name" id="server_SQL_name"
                                    class="form-control login_input" type="text" name="server_SQL_name"
-                                <?php if (isset($_POST['server_SQL_name'])) echo 'value="' . $_POST['server_SQL_name'] . '"'?>>
+                                <?php if (isset($_POST['server_SQL_name'])) echo 'value="'.$_POST['server_SQL_name'].'"'?>>
                             <br><br>
 
                             <h4>Server Setup</h4>
                             <label for="server_name">Server name: </label>
                             <input placeholder="Server name" id="server_name"
                                    class="form-control login_input" type="text" name="server_name"
-                                <?php if (isset($_POST['server_name'])) echo 'value="' . $_POST['server_name'] . '"'?>>
+                                <?php if (isset($_POST['server_name'])) echo 'value="'.$_POST['server_name'].'"'?>>
 
                             <label for="server_type">Server type: </label>
                             <select id="server_name" class=" form-control login_input" name="server_type">
@@ -375,17 +375,17 @@ 
                             <label for="server_port">Server Query Port: </label>
                             <input placeholder="Server Query Port (Default: 2302)" id="server_port"
                                    class="form-control login_input" type="text" name="server_port"
-                                <?php if (isset($_POST['server_port'])) echo 'value="' . $_POST['server_port'] . '"'?>>
+                                <?php if (isset($_POST['server_port'])) echo 'value="'.$_POST['server_port'].'"'?>>
 
                             <label for="server_IP">Server Query IP: </label>
                             <input placeholder="Server Query IP" id="server_IP"
                                    class="form-control login_input" type="text" name="server_IP"
-                                <?php if (isset($_POST['server_IP'])) echo 'value="' . $_POST['server_IP'] . '"'?>>
+                                <?php if (isset($_POST['server_IP'])) echo 'value="'.$_POST['server_IP'].'"'?>>
 
                             <label for="server_SQL_pass">RCON Password: </label>
                             <input placeholder="RCON Password" id="server_SQL_pass"
                                    class="form-control login_input" type="password" name="server_RCON_pass"
-                                <?php if (isset($_POST['server_SQL_pass'])) echo 'value="' . $_POST['server_SQL_pass'] . '"'?>>
+                                <?php if (isset($_POST['server_SQL_pass'])) echo 'value="'.$_POST['server_SQL_pass'].'"'?>>
                             <br>
                             <input class="btn btn-lg btn-primary" style="float:right;" type="submit" name="setup"
                                    value="Setup">

views/templates/page.php

Braces +12 added lines, -4 removed lines

@@ -13,9 +13,15 @@ 
     if ($total_pages > 5) {
         $start = $pageNum - 2;
         $end = $pageNum + 2;
-        if ($pageNum < 4) $start = 1;
-        if ($pageNum < 2) $end += 1;
-        if ($pageNum < 3) $end += 1;
+        if ($pageNum < 4) {
+            $start = 1;
+        }
+        if ($pageNum < 2) {
+            $end += 1;
+        }
+        if ($pageNum < 3) {
+            $end += 1;
+        }
         
         if ($pageNum > $total_pages - 2) {$start -= 1; $end -= 1; }
         if ($pageNum > $total_pages - 1) {$start -= 1; $end -= 1; }
@@ -26,7 +32,9 @@ 
     
     for ($i = $start; $i <= $end; $i++) {
         echo '<li';
-        if ($i == $pageNum) echo  ' class="active"';
+        if ($i == $pageNum) {
+            echo  ' class="active"';
+        }
         echo '><a href="?page=' . $i . '">' . $i . '</a></li>';
     }; ?>
 

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     for ($i = $start; $i <= $end; $i++) {
         echo '<li';
         if ($i == $pageNum) echo  ' class="active"';
-        echo '><a href="?page=' . $i . '">' . $i . '</a></li>';
+        echo '><a href="?page='.$i.'">'.$i.'</a></li>';
     }; ?>
 
     <li>

views/templates/template.php

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
                 ?>
             <h5 class="centered">
                 <?php
-                if ($_SESSION['steamsignon']) echo '<i class="fa fa-steam-square"></i>';
+                if ($_SESSION['steamsignon']) {
+                    echo '<i class="fa fa-steam-square"></i>';
+                }
                 echo $_SESSION['user_name']; ?>
             </h5>
 

Spacing +16 added lines, -16 removed lines

@@ -21,16 +21,16 @@ 
             <p class="centered">
                 <?php if (!isset($_SESSION['profile_link'])) {
                     if (isset($_SESSION['user_email']) && $settings['gravatar']) {
-                        echo '<a href="' . $settings['url'] . 'profile">';
-                        echo '<img src="' . getGravatar($_SESSION['user_email'],64,'retro') . '" class="img-circle" width="60" height="60"></a></p>';
+                        echo '<a href="'.$settings['url'].'profile">';
+                        echo '<img src="'.getGravatar($_SESSION['user_email'], 64, 'retro').'" class="img-circle" width="60" height="60"></a></p>';
                     } else {
-                        echo '<a href="' . $settings['url'] . 'profile">';
-                        echo '<img src="' . $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg"';
+                        echo '<a href="'.$settings['url'].'profile">';
+                        echo '<img src="'.$settings['url'].'assets/img/profile/'.$_SESSION['user_profile'].'.jpg"';
                         echo 'class="img-circle" width="60" height="60"></a></p>';
                     }
                 } else {
-                    echo '<a href="' . $_SESSION['profile_link'] . '" target="_blank">';
-                    echo '<img src="' . $_SESSION['user_profile'] . '"';
+                    echo '<a href="'.$_SESSION['profile_link'].'" target="_blank">';
+                    echo '<img src="'.$_SESSION['user_profile'].'"';
                     echo 'class="img-circle" width="64" height="64"></a></p>';
                 }
                 ?>
@@ -48,9 +48,9 @@ 
             </li>
 
 			<?php
-                if(isset($_SESSION['server_type']))
+                if (isset($_SESSION['server_type']))
                 {
-                    switch($_SESSION['server_type'])
+                    switch ($_SESSION['server_type'])
                     {
                         case 'life':
                             include("views/life/nav.php");
@@ -58,8 +58,8 @@ 
                 }
 
                 foreach ($settings['plugins'] as &$plugin) {
-                    if (file_exists("plugins/". $plugin. "/nav.php")) {
-                        include("plugins/". $plugin."/nav.php");
+                    if (file_exists("plugins/".$plugin."/nav.php")) {
+                        include("plugins/".$plugin."/nav.php");
                     }
                 }
 
@@ -135,19 +135,19 @@ 
                         <li>
                             <a href="<?php echo $settings['url'] ?>newDB">
                                 <i class="fa fa-fw fa-plus"></i>
-                                <span><?php echo $lang['new'] . ' ' . $lang['database'] ?></span>
+                                <span><?php echo $lang['new'].' '.$lang['database'] ?></span>
                             </a>
                         </li>
                         <li>
                             <a href="<?php echo $settings['url'] ?>newServer">
                                 <i class="fa fa-fw fa-plus"></i>
-                                <span><?php echo $lang['new'] . ' ' . $lang['server'] ?></span>
+                                <span><?php echo $lang['new'].' '.$lang['server'] ?></span>
                             </a>
                         </li>
                         <li>
                             <a href="<?php echo $settings['url'] ?>servers">
                                 <i class="fa fa-fw fa-cogs"></i>
-                                <span><?php echo $lang['edit'] . ' ' . $lang['databases'] ?></span>
+                                <span><?php echo $lang['edit'].' '.$lang['databases'] ?></span>
                             </a>
                         </li>
                         <li>
@@ -170,7 +170,7 @@ 
             <li>
                 <a data-toggle="modal" href="#changeDB">
                     <i class="fa fa-fw fa-cogs"></i>
-                    <span><?php echo $lang['database'] . 's' ?></span>
+                    <span><?php echo $lang['database'].'s' ?></span>
                 </a>
             </li>
             <?php } ?>
@@ -189,10 +189,10 @@ 
     <section class="wrapper">
         <?php
         if (isset($error)) {
-            echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">' . $error . '</div>';
+            echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">'.$error.'</div>';
         }
         if (isset($message)) {
-            echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">' . $message . '</div>';
+            echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">'.$message.'</div>';
         }
         if (isset($page)) {
             include($page);