Cyberbyte-Studios / CyberWorks

classes/openid.php

Doc Comments +17 added lines, -1 removed lines

@@ -154,6 +154,9 @@ 
         return !!gethostbynamel($server);
     }
 
+    /**
+     * @param boolean $update_claimed_id
+     */
     protected function request_curl($url, $method = 'GET', $params = array(), $update_claimed_id)
     {
         $params = http_build_query($params, '', '&');
@@ -262,6 +265,9 @@ 
         return $headers;
     }
 
+    /**
+     * @param boolean $update_claimed_id
+     */
     protected function request_streams($url, $method = 'GET', $params = array(), $update_claimed_id)
     {
         if (!$this->hostExists($url)) {
@@ -384,6 +390,11 @@ 
     /**
      * Helper function used to scan for <meta>/<link> tags and extract information
      * from them
+     * @param string $tag
+     * @param string $attrName
+     * @param string $attrValue
+     * @param string $valueName
+     * @return string
      */
     protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
     {
@@ -628,6 +639,9 @@ 
         return $params;
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v1($immediate)
     {
         $returnUrl = $this->returnUrl;
@@ -649,6 +663,9 @@ 
                                 , array('query' => http_build_query($params, '', '&')));
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v2($immediate)
     {
         $params = array(
@@ -684,7 +701,6 @@ 
     /**
      * Returns authentication url. Usually, you want to redirect your user to it.
      * @return String The authentication url.
-     * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
      * @throws ErrorException
      */
     function authUrl($immediate = false)

Indentation +47 added lines, -47 removed lines

@@ -1,52 +1,52 @@
 <?php
 /**
-     * This class provides a simple interface for OpenID (1.1 and 2.0) authentication.
-     * Supports Yadis discovery.
-     * The authentication process is stateless/dumb.
-     *
-     * Usage:
-     * Sign-on with OpenID is a two step process:
-     * Step one is authentication with the provider:
-     * <code>
-     * $openid = new LightOpenID('my-host.example.org');
-     * $openid->identity = 'ID supplied by user';
-     * header('Location: ' . $openid->authUrl());
-     * </code>
-     * The provider then sends various parameters via GET, one of them is openid_mode.
-     * Step two is verification:
-     * <code>
-     * $openid = new LightOpenID('my-host.example.org');
-     * if ($openid->mode) {
-     *     echo $openid->validate() ? 'Logged in.' : 'Failed';
-     * }
-     * </code>
-     *
-     * Change the 'my-host.example.org' to your domain name. Do NOT use $_SERVER['HTTP_HOST']
-     * for that, unless you know what you are doing.
-     *
-     * Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
-     * The default values for those are:
-     * $openid->realm     = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
-     * $openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI'];
-     * If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
-     *
-     * AX and SREG extensions are supported.
-     * To use them, specify $openid->required and/or $openid->optional before calling $openid->authUrl().
-     * These are arrays, with values being AX schema paths (the 'path' part of the URL).
-     * For example:
-     *   $openid->required = array('namePerson/friendly', 'contact/email');
-     *   $openid->optional = array('namePerson/first');
-     * If the server supports only SREG or OpenID 1.1, these are automaticaly
-     * mapped to SREG names, so that user doesn't have to know anything about the server.
-     *
-     * To get the values, use $openid->getAttributes().
-     *
-     *
-     * The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled.
-     * @author Mewp
-     * @copyright Copyright (c) 2010, Mewp
-     * @license http://www.opensource.org/licenses/mit-license.php MIT
-     */
+ * This class provides a simple interface for OpenID (1.1 and 2.0) authentication.
+ * Supports Yadis discovery.
+ * The authentication process is stateless/dumb.
+ *
+ * Usage:
+ * Sign-on with OpenID is a two step process:
+ * Step one is authentication with the provider:
+ * <code>
+ * $openid = new LightOpenID('my-host.example.org');
+ * $openid->identity = 'ID supplied by user';
+ * header('Location: ' . $openid->authUrl());
+ * </code>
+ * The provider then sends various parameters via GET, one of them is openid_mode.
+ * Step two is verification:
+ * <code>
+ * $openid = new LightOpenID('my-host.example.org');
+ * if ($openid->mode) {
+ *     echo $openid->validate() ? 'Logged in.' : 'Failed';
+ * }
+ * </code>
+ *
+ * Change the 'my-host.example.org' to your domain name. Do NOT use $_SERVER['HTTP_HOST']
+ * for that, unless you know what you are doing.
+ *
+ * Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
+ * The default values for those are:
+ * $openid->realm     = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+ * $openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI'];
+ * If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
+ *
+ * AX and SREG extensions are supported.
+ * To use them, specify $openid->required and/or $openid->optional before calling $openid->authUrl().
+ * These are arrays, with values being AX schema paths (the 'path' part of the URL).
+ * For example:
+ *   $openid->required = array('namePerson/friendly', 'contact/email');
+ *   $openid->optional = array('namePerson/first');
+ * If the server supports only SREG or OpenID 1.1, these are automaticaly
+ * mapped to SREG names, so that user doesn't have to know anything about the server.
+ *
+ * To get the values, use $openid->getAttributes().
+ *
+ *
+ * The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled.
+ * @author Mewp
+ * @copyright Copyright (c) 2010, Mewp
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
+ */
 class LightOpenID
 {
     public $returnUrl

Spacing +24 added lines, -24 removed lines

@@ -73,12 +73,12 @@ 
 
     function __construct($host)
     {
-        $this->trustRoot = (strpos($host, '://') ? $host : 'http://' . $host);
+        $this->trustRoot = (strpos($host, '://') ? $host : 'http://'.$host);
         if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
             || (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
             && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
         ) {
-            $this->trustRoot = (strpos($host, '://') ? $host : 'https://' . $host);
+            $this->trustRoot = (strpos($host, '://') ? $host : 'https://'.$host);
         }
 
         if (($host_end = strpos($this->trustRoot, '/', 8)) !== false) {
@@ -86,7 +86,7 @@ 
         }
 
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
-        $this->returnUrl = $this->trustRoot . $uri;
+        $this->returnUrl = $this->trustRoot.$uri;
 
         $this->data = ($_SERVER['REQUEST_METHOD'] === 'POST') ? $_POST : $_GET;
 
@@ -157,7 +157,7 @@ 
     protected function request_curl($url, $method = 'GET', $params = array(), $update_claimed_id)
     {
         $params = http_build_query($params, '', '&');
-        $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
+        $curl = curl_init($url.($method == 'GET' && $params ? '?'.$params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -252,7 +252,7 @@ 
                     } elseif ($headers[$name][0] == '/') {
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
-                        $this->claimed_id = $parsed_url['scheme'] . '://'
+                        $this->claimed_id = $parsed_url['scheme'].'://'
                                             . $parsed_url['host']
                                             . $headers[$name];
                     }
@@ -280,7 +280,7 @@ 
                         'CN_match' => parse_url($url, PHP_URL_HOST),
                     ),
                 );
-                $url = $url . ($params ? '?' . $params : '');
+                $url = $url.($params ? '?'.$params : '');
                 break;
             case 'POST':
                 $opts = array(
@@ -311,7 +311,7 @@ 
                     )
                 );
 
-                $url = $url . ($params ? '?' . $params : '');
+                $url = $url.($params ? '?'.$params : '');
                 $headers = get_headers($url);
                 if (!$headers) {
                     return array();
@@ -365,11 +365,11 @@ 
     protected function build_url($url, $parts)
     {
         if (isset($url['query'], $parts['query'])) {
-            $parts['query'] = $url['query'] . '&' . $parts['query'];
+            $parts['query'] = $url['query'].'&'.$parts['query'];
         }
 
         $url = $parts + $url;
-        $url = $url['scheme'] . '://'
+        $url = $url['scheme'].'://'
                 . (empty($url['username']) ? ''
                  :(empty($url['password']) ? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
@@ -442,11 +442,11 @@ 
 
                     preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m);
                     foreach ($m[1] as $content) {
-                        $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
+                        $content = ' '.$content; # The space is added, so that strpos doesn't return 0.
 
                         # OpenID 2
                         $ns = preg_quote('http://specs.openid.net/auth/2.0/', '#');
-                        if (preg_match('#<Type>\s*' . $ns . '(server|signon)\s*</Type>#s', $content, $type)) {
+                        if (preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
                             if ($type[1] == 'server') {
                                 $this->identifier_select = true;
                             }
@@ -473,7 +473,7 @@ 
 
                         # OpenID 1.1
                         $ns = preg_quote('http://openid.net/signon/1.1', '#');
-                        if (preg_match('#<Type>\s*' . $ns . '\s*</Type>#s', $content)) {
+                        if (preg_match('#<Type>\s*'.$ns.'\s*</Type>#s', $content)) {
 
                             preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
                             preg_match('#<.*?Delegate>(.*)</.*?Delegate>#', $content, $delegate);
@@ -598,7 +598,7 @@ 
                     if (is_int($alias)) {
                         $alias = strtr($field, '/', '_');
                     }
-                    $this->aliases[$alias] = 'http://axschema.org/' . $field;
+                    $this->aliases[$alias] = 'http://axschema.org/'.$field;
                     if (empty($counts[$alias])) {
                         $counts[$alias] = 0;
                     }
@@ -607,13 +607,13 @@ 
                 }
             }
             foreach ($this->aliases as $alias => $ns) {
-                $params['openid.ax.type.' . $alias] = $ns;
+                $params['openid.ax.type.'.$alias] = $ns;
             }
             foreach ($counts as $alias => $count) {
                 if ($count == 1) {
                     continue;
                 }
-                $params['openid.ax.count.' . $alias] = $count;
+                $params['openid.ax.count.'.$alias] = $count;
             }
 
             # Don't send empty ax.requied and ax.if_available.
@@ -635,7 +635,7 @@ 
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
         if ($this->identity != $this->claimed_id) {
-            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id;
+            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?').'openid.claimed_id='.$this->claimed_id;
         }
 
         $params = array(
@@ -739,7 +739,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                                .  'openid.claimed_id=' . $this->claimed_id;
+                                .  'openid.claimed_id='.$this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -757,8 +757,8 @@ 
             # In such case, validation would fail, since we'd send different data than OP
             # wants to verify. stripslashes() should solve that problem, but we can't
             # use it when magic_quotes is off.
-            $value = $this->data['openid_' . str_replace('.', '_', $item)];
-            $params['openid.' . $item] = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() ? stripslashes($value) : $value;
+            $value = $this->data['openid_'.str_replace('.', '_', $item)];
+            $params['openid.'.$item] = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() ? stripslashes($value) : $value;
 
         }
 
@@ -796,19 +796,19 @@ 
 
         $attributes = array();
         foreach (explode(',', $this->data['openid_signed']) as $key) {
-            $keyMatch = $alias . '.value.';
+            $keyMatch = $alias.'.value.';
             if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
                 continue;
             }
             $key = substr($key, strlen($keyMatch));
-            if (!isset($this->data['openid_' . $alias . '_type_' . $key])) {
+            if (!isset($this->data['openid_'.$alias.'_type_'.$key])) {
                 # OP is breaking the spec by returning a field without
                 # associated ns. This shouldn't happen, but it's better
                 # to check, than cause an E_NOTICE.
                 continue;
             }
-            $value = $this->data['openid_' . $alias . '_value_' . $key];
-            $key = substr($this->data['openid_' . $alias . '_type_' . $key],
+            $value = $this->data['openid_'.$alias.'_value_'.$key];
+            $key = substr($this->data['openid_'.$alias.'_type_'.$key],
                             strlen('http://axschema.org/'));
 
             $attributes[$key] = $value;
@@ -830,7 +830,7 @@ 
                 # The field name isn't part of the SREG spec, so we ignore it.
                 continue;
             }
-            $attributes[$sreg_to_ax[$key]] = $this->data['openid_sreg_' . $key];
+            $attributes[$sreg_to_ax[$key]] = $this->data['openid_sreg_'.$key];
         }
         return $attributes;
     }

classes/steamlogin.php

Doc Comments +3 added lines

@@ -3,6 +3,9 @@
 
 class user
 {
+    /**
+     * @param string $steamid
+     */
     public function GetPlayerSummaries($steamid)
     {
         $settings = require('config/settings.php');

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
     public function GetPlayerSummaries($steamid)
     {
         $settings = require('config/settings.php');
-        $response = file_get_contents('http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key=' . $settings['steamAPI'] . '&steamids=' . $steamid);
+        $response = file_get_contents('http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key='.$settings['steamAPI'].'&steamids='.$steamid);
         $json = json_decode($response);
         return $json->response->players[0];
     }
@@ -19,7 +19,7 @@ 
             $openid = new LightOpenID($settings['url']);
             if (!$openid->mode) {
                 $openid->identity = 'http://steamcommunity.com/openid';
-                header('Location: ' . $openid->authUrl());
+                header('Location: '.$openid->authUrl());
             } elseif ($openid->mode == 'cancel') {
                 print ('User has canceled authentication!');
             } else {
@@ -30,7 +30,7 @@ 
                     $db_connection = masterConnect();
 
                     $sql = "SELECT user_name, user_email, user_level, user_profile, permissions, user_password_hash, user_id
-                            FROM users WHERE playerid = '" . $_SESSION['playerid'] . "';";
+                            FROM users WHERE playerid = '" . $_SESSION['playerid']."';";
                     $result_of_login_check = $db_connection->query($sql);
 
                     if ($result_of_login_check->num_rows == 1) {
@@ -54,10 +54,10 @@ 
                             $_SESSION['steamsignon'] = false; //used to determine if its a single sign on with no account
                             multiDB();
 
-                            logAction($_SESSION['user_name'], 'Successful Steam Login (' . $_SERVER['REMOTE_ADDR'] . ')', 2);
+                            logAction($_SESSION['user_name'], 'Successful Steam Login ('.$_SERVER['REMOTE_ADDR'].')', 2);
                         } else {
                             $this->errors[] = "User is banned.";
-                            logAction($_POST['user_name'], 'Steam Login Failed - Banned User (' . $_SERVER['REMOTE_ADDR'] . ')', 3);
+                            logAction($_POST['user_name'], 'Steam Login Failed - Banned User ('.$_SERVER['REMOTE_ADDR'].')', 3);
                         }
                     } else {
                         if ($settings['annonlogin']) {
@@ -73,12 +73,12 @@ 
                             $_SESSION['steamsignon'] = true; //used to determine if its a single sign on with no account
                             multiDB();
 
-                            logAction($_SESSION['user_name'], 'Successful Steam Login (' . $_SERVER['REMOTE_ADDR'] . ')', 2);
+                            logAction($_SESSION['user_name'], 'Successful Steam Login ('.$_SERVER['REMOTE_ADDR'].')', 2);
                         } else {
                             errorMessage(7);
                         }
                     }
-                    header('Location: ' . $settings['url']);
+                    header('Location: '.$settings['url']);
                     exit;
                 } else {
                     print ('Error');

views/steam/dashboard.php

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 								</div>
 							</div>
 						</li>
-			<?php }elseif ($row['type'] == 'waste') { ?>
+			<?php } elseif ($row['type'] == 'waste') { ?>
 						<li class="list-danger">
 							<i class=" fa fa-ellipsis-v"></i>
 							<div class="task-title">

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
     </div>
 </div>
 <?php if (isset($message)) {
-    echo '<div class="alert alert-info" role="alert">' . $message . '</div>';
+    echo '<div class="alert alert-info" role="alert">'.$message.'</div>';
 }
 ?>
 
@@ -26,7 +26,7 @@ 
 
     if ($result_of_query->num_rows >= 1) {
         while ($row = mysqli_fetch_assoc($result_of_query)) {
-            if ($row['type'] == 'life'){ ?>
+            if ($row['type'] == 'life') { ?>
 						<li class="list-primary">
 							<i class=" fa fa-ellipsis-v"></i>
 							<div class="task-title">

views/steam/life/dashboard.php

Braces +3 added lines, -1 removed lines

@@ -272,7 +272,8 @@ 
                                     </tbody>
                                 </table>
                                 <?php echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"> More</a>';
-                            } else echo $lang['noHouse'] ?>
+                            } else {
+                                echo $lang['noHouse'] ?>
                         </div>
                     </div>
                 <?php } if ($player->playerid == $_SESSION['playerid']) { ?>
@@ -281,6 +282,7 @@ 
                         <?php
                             $sql = "SELECT `classname`,`type`,`id`,`plate` FROM `vehicles` WHERE `pid` = '" . $player->playerid . "' ORDER BY `id` DESC LIMIT 8";
                             }
+                            }
                             $result_of_query = $db_link->query($sql);
                             if ($result_of_query->num_rows > 0) {
                                 $veh = $result_of_query->fetch_object();

Spacing +53 added lines, -53 removed lines

@@ -5,9 +5,9 @@ 
     require_once("config/images.php");
     require_once("config/license.php");
 } else {
-    require_once(realpath($settings['url']) . "config/carNames.php");
-    require_once(realpath($settings['url']) . "config/images.php");
-    require_once(realpath($settings['url']) . "config/license.php");
+    require_once(realpath($settings['url'])."config/carNames.php");
+    require_once(realpath($settings['url'])."config/images.php");
+    require_once(realpath($settings['url'])."config/license.php");
 }
 
 $db_link = serverConnect();
@@ -28,7 +28,7 @@ 
     }
 }
 
-$sql = "SELECT *, $playerIdColumn as playerid FROM `players` WHERE $playerIdColumn = '" . $_SESSION['playerid'] . "'";
+$sql = "SELECT *, $playerIdColumn as playerid FROM `players` WHERE $playerIdColumn = '".$_SESSION['playerid']."'";
 $result = $db_link->query($sql);
 if ($result->num_rows > 0) {
     $player = $result->fetch_object();
@@ -39,7 +39,7 @@ 
         $temp .= chr($pGID & 0xFF);
         $pGID >>= 8;
     }
-    $pGID = md5('BE' . $temp);
+    $pGID = md5('BE'.$temp);
 ?>
 <div class="col-md-3" style="float:left;  padding-top:20px;">
     <div class="panel panel-default">
@@ -53,26 +53,26 @@ 
                 $alias = str_replace('"[`', "", $player->aliases);
                 $alias = str_replace('`]"', "", $alias);
 
-                echo '<center><img alt="' . $alias . '" src="' . $settings['url'] . 'assets/img/uniform/' . getPlayerSkin($player->civ_gear, $playerSkins) . '.jpg">';
-                echo "<h4>" . $lang['aliases'] . ": " . $alias . "</h4>";
-                echo "<h4>" . $lang['playerID'] . ": " . $player->playerid . "</h4>";
-                echo "<h4 style='word-wrap: break-word;'>" . $lang['GUID'] . ": " . $pGID . "</h4>";
+                echo '<center><img alt="'.$alias.'" src="'.$settings['url'].'assets/img/uniform/'.getPlayerSkin($player->civ_gear, $playerSkins).'.jpg">';
+                echo "<h4>".$lang['aliases'].": ".$alias."</h4>";
+                echo "<h4>".$lang['playerID'].": ".$player->playerid."</h4>";
+                echo "<h4 style='word-wrap: break-word;'>".$lang['GUID'].": ".$pGID."</h4>";
             ?>
             <i class="fa fa-2x fa-money"></i>
-            <h4> <?php echo $lang['cash'] . ": " . $player->cash; ?> </h4>
+            <h4> <?php echo $lang['cash'].": ".$player->cash; ?> </h4>
             <i style="padding-left:15px;" class="fa fa-2x fa-bank"></i>
-            <h4> <?php echo $lang['bank'] . ": " . $player->bankacc; ?> </h4>
+            <h4> <?php echo $lang['bank'].": ".$player->bankacc; ?> </h4>
             <?php
                 if ($player->arrested == 0) {
-                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-success'>" . $lang["not"] . " " . $lang["arrested"] . "</button></h4>";
+                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-success'>".$lang["not"]." ".$lang["arrested"]."</button></h4>";
                 } else {
-                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-theme01'>" . $lang["arrested"] . "</button></h4>";
+                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-theme01'>".$lang["arrested"]."</button></h4>";
                 }
 
                 if ($player->blacklist == 0) {
-                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-success'>" . $lang["not"] . " " . $lang["blacklisted"] . "</button></h4>";
+                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-success'>".$lang["not"]." ".$lang["blacklisted"]."</button></h4>";
                 } else {
-                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-theme01'>" . $lang["blacklisted"] . "</button></h4>";
+                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-theme01'>".$lang["blacklisted"]."</button></h4>";
                 }
 
                 echo "</center>";
@@ -89,34 +89,34 @@ 
             <div class="box1">
                 <span class="fa fa-3x fa-taxi"></span>
 
-                <h3> <?php echo $lang['police'] . ": " . $player->coplevel; ?> </h3>
+                <h3> <?php echo $lang['police'].": ".$player->coplevel; ?> </h3>
             </div>
         </div>
         <div class="col-md-2 col-sm-2 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-ambulance"></span>
 
-                <h3> <?php echo $lang['medic'] . ": " . $player->mediclevel; ?> </h3>
+                <h3> <?php echo $lang['medic'].": ".$player->mediclevel; ?> </h3>
             </div>
         </div>
         <div class="col-md-2 col-sm-2 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-usd"></span>
 
-                <h3> <?php echo $lang['donator'] . ": " . $player->$settings['donorFormat']; ?> </h3>
+                <h3> <?php echo $lang['donator'].": ".$player->$settings['donorFormat']; ?> </h3>
             </div>
         </div>
         <div class="col-md-2 col-sm-2 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-group"></span>
 
-                <h3> <?php echo $lang['admin'] . ": " . $player->adminlevel; ?> </h3>
+                <h3> <?php echo $lang['admin'].": ".$player->adminlevel; ?> </h3>
             </div>
         </div>
         <?php
         if ($player->playerid == $_SESSION['playerid']) {
             echo '<div class="col-md-2 col-sm-2 box0">';
-            echo '<a href="http://steamcommunity.com/profiles/' . $player->playerid . '"';
+            echo '<a href="http://steamcommunity.com/profiles/'.$player->playerid.'"';
             echo 'target="_blank">';
             echo '<div class="box1">';
             echo '<span class="fa fa-3x fa-steam"></span>';
@@ -151,25 +151,25 @@ 
             <div id="myTabContent" class="tab-content">
                 <?php if ($player->playerid == $_SESSION['playerid']) { ?>
                     <div class="tab-pane fade in active well" id="civ_lic">
-                        <h4 style="centred"><?php echo $lang['civ'] . " " . $lang['licenses']; ?> </h4>
+                        <h4 style="centred"><?php echo $lang['civ']." ".$lang['licenses']; ?> </h4>
                         <?php
                             if ($player->civ_licenses !== '"[]"') {
                                 $return = stripArray($player->civ_licenses, 0);
                                 foreach ($return as $value) {
                                     if (strpos($value, "1") == TRUE) {
                                         $name = before(',', $value);
-                                        echo "<button class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     } else {
                                         $name = before(',', $value);
-                                        echo "<button class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     }
                                 }
                             } else {
-                                echo $lang['no'] . " " . $lang['licenses'];
+                                echo $lang['no']." ".$lang['licenses'];
                             }?>
                     </div>
                     <div class="tab-pane well fade" id="medic_lic">
-                        <h4 style="centred"><?php echo $lang['medic'] . " " . $lang['licenses']; ?> </h4>
+                        <h4 style="centred"><?php echo $lang['medic']." ".$lang['licenses']; ?> </h4>
                         <?php
                             if ($player->med_licenses !== '"[]"') {
                                 $return = stripArray($player->med_licenses, 0);
@@ -177,18 +177,18 @@ 
                                 foreach ($return as $value) {
                                     if (strpos($value, "1") == TRUE) {
                                         $name = before(',', $value);
-                                        echo "<button class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     } else {
                                         $name = before(',', $value);
-                                        echo "<button class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     }
                                 }
                             } else {
-                                echo $lang['no'] . " " . $lang['licenses'];
+                                echo $lang['no']." ".$lang['licenses'];
                             } ?>
                     </div>
                     <div class="tab-pane well fade" id="police_lic">
-                        <h4 style="centred"><?php echo $lang['cop'] . " " . $lang['licenses']; ?> </h4>
+                        <h4 style="centred"><?php echo $lang['cop']." ".$lang['licenses']; ?> </h4>
                         <?php
                             if ($player->cop_licenses !== '"[]"') {
                                 $return = stripArray($player->cop_licenses, 0);
@@ -196,22 +196,22 @@ 
                                 foreach ($return as $value) {
                                     if (strpos($value, "1") == TRUE) {
                                         $name = before(',', $value);
-                                        echo "<button class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     } else {
                                         $name = before(',', $value);
-                                        echo "<button class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     }
                                 }
                             } else {
-                                echo $lang['no'] . " " . $lang['licenses'];
+                                echo $lang['no']." ".$lang['licenses'];
                             }
                         ?>
                     </div>
                 <?php } if ($player->playerid == $_SESSION['playerid']) { ?>
                     <div class="tab-pane fade well" id="civ_inv">
-                        <h4 style="centred"><?php echo $lang['civ'] . " " . $lang['gear']; ?> </h4>
+                        <h4 style="centred"><?php echo $lang['civ']." ".$lang['gear']; ?> </h4>
                         <?php
-                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>" . $player->civ_gear . "</textarea>";
+                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>".$player->civ_gear."</textarea>";
                         echo '<br>';
 
                         if ($_SESSION['permissions']['edit']['inventory']) {
@@ -222,9 +222,9 @@ 
                         <br>
                     </div>
                     <div class="tab-pane fade well" id="police_inv">
-                        <h4 style="centred"><?php echo $lang['police'] . " " . $lang['gear']; ?> </h4>
+                        <h4 style="centred"><?php echo $lang['police']." ".$lang['gear']; ?> </h4>
                         <?php
-                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='cop_gear'>" . $player->cop_gear . "</textarea>";
+                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='cop_gear'>".$player->cop_gear."</textarea>";
                         echo '<br>';
                         if ($_SESSION['permissions']['edit']['inventory']) {
                             echo '<a data-toggle="modal" href="#edit_cop_inv" class="btn btn-primary btn-xs" style="float: right;">';
@@ -234,9 +234,9 @@ 
                         <br>
                     </div>
                     <div class="tab-pane fade well" id="medic_inv">
-                        <h4 style="centred"><?php echo $lang['medic'] . " " . $lang['gear']; ?> </h4>
+                        <h4 style="centred"><?php echo $lang['medic']." ".$lang['gear']; ?> </h4>
                         <?php
-                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='med_gear'>" . $player->med_gear . "</textarea>";
+                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='med_gear'>".$player->med_gear."</textarea>";
                         echo '<br>';
                         if ($_SESSION['permissions']['edit']['inventory']) {
                             echo '<a data-toggle="modal" href="#edit_med_inv" class="btn btn-primary btn-xs" style="float: right;">';
@@ -248,7 +248,7 @@ 
                     <div class="tab-pane fade" id="house">
                         <div class="table-responsive">
                             <?php
-                            $sql = "SELECT `pos`,`id` FROM `houses` WHERE `pid` = '" . $player->playerid . "' ORDER BY `id` DESC LIMIT 8";
+                            $sql = "SELECT `pos`,`id` FROM `houses` WHERE `pid` = '".$player->playerid."' ORDER BY `id` DESC LIMIT 8";
                             $result_of_query = $db_link->query($sql);
                             if ($result_of_query->num_rows > 0) {
                                 ?>
@@ -263,15 +263,15 @@ 
                                     <?php
                                     while ($row = mysqli_fetch_assoc($result_of_query)) {
                                         echo "<tr>";
-                                        echo "<td>" . $row["pos"] . "</td>";
-                                        echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editHouse/" . $row["id"] . "'>";
+                                        echo "<td>".$row["pos"]."</td>";
+                                        echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editHouse/".$row["id"]."'>";
                                         echo "<i class='fa fa-pencil'></i></a></td>";
                                         echo "</tr>";
                                     };
                                     ?>
                                     </tbody>
                                 </table>
-                                <?php echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"> More</a>';
+                                <?php echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="'.$settings['url'].'houses/'.$player->playerid.'"> More</a>';
                             } else echo $lang['noHouse'] ?>
                         </div>
                     </div>
@@ -279,33 +279,33 @@ 
                     <div class="tab-pane fade" id="veh">
                         <div class="table-responsive">
                         <?php
-                            $sql = "SELECT `classname`,`type`,`id`,`plate` FROM `vehicles` WHERE `pid` = '" . $player->playerid . "' ORDER BY `id` DESC LIMIT 8";
+                            $sql = "SELECT `classname`,`type`,`id`,`plate` FROM `vehicles` WHERE `pid` = '".$player->playerid."' ORDER BY `id` DESC LIMIT 8";
                             }
                             $result_of_query = $db_link->query($sql);
                             if ($result_of_query->num_rows > 0) {
                                 $veh = $result_of_query->fetch_object();
                                 echo '<table class="table table-bordered table-hover table-striped">';
                                 echo '<thead><tr>';
-                                echo '<th>' . $lang['class'] . '</th>';
-                                echo '<th>' . $lang['type'] . '</th>';
-                                echo '<th>' . $lang['plate'] . '</th>';
+                                echo '<th>'.$lang['class'].'</th>';
+                                echo '<th>'.$lang['type'].'</th>';
+                                echo '<th>'.$lang['plate'].'</th>';
                                 if ($_SESSION['permissions']['edit']['vehicles']) {
-                                    echo "<th>" . $lang['edit'] . "</th>";
+                                    echo "<th>".$lang['edit']."</th>";
                                 }
                                 echo '</tr></thead><tbody';
                                 echo '<tr>';
-                                echo '<td>' . carName($veh->classname) . '</td>';
-                                echo '<td>' . carType($veh->type, $lang) . '</td>';
-                                echo '<td>' . $veh->plate . '</td>';
+                                echo '<td>'.carName($veh->classname).'</td>';
+                                echo '<td>'.carType($veh->type, $lang).'</td>';
+                                echo '<td>'.$veh->plate.'</td>';
 
                                 if ($_SESSION['permissions']['edit']['vehicles']) {
-                                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh.php?ID=" . $veh->id . "'>";
+                                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editVeh.php?ID=".$veh->id."'>";
                                     echo "<i class='fa fa-pencil'></i></a></td>";
                                 }
 
                                 echo '</tr>';
                                 echo '</tbody></table>';
-                                echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"> More</a>';
+                                echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="'.$settings['url'].'vehicles/'.$player->playerid.'"> More</a>';
 
                             } else {
                                 echo $lang['noVeh'];
@@ -323,6 +323,6 @@ 
     if ($settings['url'] == "/") {
         include("views/steam/errors/noData.php");
     } else {
-        include(realpath($settings['url']) . "views/steam/errors/noData.php");
+        include(realpath($settings['url'])."views/steam/errors/noData.php");
     }
 } ?>
\ No newline at end of file

views/core/servers.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
     if ($result_of_query->num_rows >= 1) {
         while ($row = mysqli_fetch_assoc($result_of_query)) {
-            if ($row['type'] == 'life'){
+            if ($row['type'] == 'life') {
 ?>
 						<li class="list-primary">
 							<i class=" fa fa-ellipsis-v"></i>

Braces +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 								</div>
 							</div>
 						</li>
-					<?php }elseif ($row['type'] == 'waste') { ?>
+					<?php } elseif ($row['type'] == 'waste') { ?>
 						<li class="list-danger">
 							<i class=" fa fa-ellipsis-v"></i>
 							<div class="task-title">

views/core/dashboard.php

Indentation +15 added lines, -15 removed lines

@@ -18,23 +18,23 @@ 
 			  <div class="task-content">
 				  <ul id="sortable" class="task-list ui-sortable">
 			<?php
-			    $sql = "SELECT `sid`,`dbid`,`type`,`name` FROM `servers`;";
-			    $result_of_query = $db_connection->query($sql);
+                $sql = "SELECT `sid`,`dbid`,`type`,`name` FROM `servers`;";
+                $result_of_query = $db_connection->query($sql);
 			
-			    if ($result_of_query->num_rows >= 1) {
-			        while ($row = mysqli_fetch_assoc($result_of_query)) {
-			?>
+                if ($result_of_query->num_rows >= 1) {
+                    while ($row = mysqli_fetch_assoc($result_of_query)) {
+            ?>
 					<li class="list-primary">
 						<i class=" fa fa-ellipsis-v"></i>
 						<div class="task-title">
 							<span class="task-title-sp"><?php echo $row['name']; ?></span>
 							<?php
-							if ($row['type'] == 'life'){
-								echo '<span class="badge bg-theme">Life</span>';
-							} elseif ($row['type'] == 'waste') {
-								echo '<span class="badge bg-important">Wasteland</span>';
-							}
-							?>
+                            if ($row['type'] == 'life'){
+                                echo '<span class="badge bg-theme">Life</span>';
+                            } elseif ($row['type'] == 'waste') {
+                                echo '<span class="badge bg-important">Wasteland</span>';
+                            }
+                            ?>
 							<div style="float:right; padding-right: 15px;">
 								<form method="post" action="<?php echo $settings['url'] ?>dashboard">
 									<input type="hidden" name="type" value="<?php echo $row['type']; ?>">
@@ -45,10 +45,10 @@ 
 						</div>
 					</li>
 					<?php
-			        }
-			        echo '</select>';
-			    }
-			?>
+                    }
+                    echo '</select>';
+                }
+            ?>
 				  </ul>
 			  </div>
 		  </div>

Braces +4 added lines, -1 removed lines

@@ -5,7 +5,10 @@
         </h1>
     </div>
 </div>
-<?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ')</div>'; ?>
+<?php if (isset($_SESSION['update'])) {
+    echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ')</div>';
+}
+?>
 
 <div class="row mt mb">
   <div class="col-md-12">

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
         </h1>
     </div>
 </div>
-<?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ')</div>'; ?>
+<?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">'.$land['updateMessage'].' ('.$_SESSION['message']->version.')</div>'; ?>
 
 <div class="row mt mb">
   <div class="col-md-12">
@@ -29,7 +29,7 @@ 
 						<div class="task-title">
 							<span class="task-title-sp"><?php echo $row['name']; ?></span>
 							<?php
-							if ($row['type'] == 'life'){
+							if ($row['type'] == 'life') {
 								echo '<span class="badge bg-theme">Life</span>';
 							} elseif ($row['type'] == 'waste') {
 								echo '<span class="badge bg-important">Wasteland</span>';

views/core/2factor.php

Braces +28 added lines, -10 removed lines

@@ -32,7 +32,9 @@ 
     setcookie('token', '', time() - 3600, '/');
     message($lang['2factorDeviceRevoke']);
 } elseif (isset($_GET['revokeToken']) && $_SESSION['2factor'] == 2) {
-    if (isset($_COOKIE['token'])) unset($_COOKIE['token']);
+    if (isset($_COOKIE['token'])) {
+        unset($_COOKIE['token']);
+    }
     $sql = "UPDATE `users` SET `token`='NULL' WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
     $db_connection->query($sql);
     message($lang['2factorTokenRevoke']);
@@ -42,8 +44,10 @@ 
     $db_connection->query($sql);
     $_SESSION['2factor'] = 2;
     message($lang['2factor1']);
-    } else message($lang['2factor2']);
-} ?>
+    } else {
+        message($lang['2factor2']);
+    }
+    } ?>
 <div class="row">
     <div class="col-lg-8">
         <h1 class="page-header">
@@ -53,7 +57,9 @@ 
 </div>
 <?php
 if ($_SESSION['2factor'] == 1 || $_SESSION['2factor'] == 5 || $_SESSION['2factor'] == 3) {
-    if ($_SESSION['2factor'] == 3) message($lang['2factorError2']);
+    if ($_SESSION['2factor'] == 3) {
+        message($lang['2factorError2']);
+    }
     echo '<form method="post" action="' . $currentPage . '" class="form-inline">
   <label for="code">'.$lang['2factorSetup3'] . '<div class="form-group"></label><input class="form-control" id="code" type="text" name="code"></div>
   <button type="submit" class="btn btn-default">Verify</button></form>';
@@ -61,12 +67,21 @@ 
     echo $lang['2factor1'] . '<br><br><a href="?backup" class="btn btn-default">';
     $sql = "SELECT `backup`,`token` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
     $twoFactor = $db_connection->query($sql)->fetch_object();
-    if (isset($twoFactor->backup)) echo $lang['new'] . ' ' . $lang['2factor3']; else echo $lang['2factor3'];
+    if (isset($twoFactor->backup)) {
+        echo $lang['new'] . ' ' . $lang['2factor3'];
+    } else {
+        echo $lang['2factor3'];
+    }
     echo '</a>';
     echo '<a href="?revoke" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factor4'] . '</a>';
-    if (isset($twoFactor->token)) echo '<a href="?revokeToken" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factorTokenRevoke'] . '</a>';
-    if (isset($_COOKIE['token'])) echo '<a href="?revokeDevice" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factorRevokeRememberDevice'];
-    else echo '<a href="?remember" style="margin-left: 5px;" class="btn btn-primary">' . $lang['2factorRememberDevice'];
+    if (isset($twoFactor->token)) {
+        echo '<a href="?revokeToken" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factorTokenRevoke'] . '</a>';
+    }
+    if (isset($_COOKIE['token'])) {
+        echo '<a href="?revokeDevice" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factorRevokeRememberDevice'];
+    } else {
+        echo '<a href="?remember" style="margin-left: 5px;" class="btn btn-primary">' . $lang['2factorRememberDevice'];
+    }
     echo '</a>';
 
 } elseif ($_SESSION['2factor'] == 0 || $_SESSION['2factor'] == 5) {
@@ -76,8 +91,11 @@ 
         echo "<i class='fa fa-info-circle'></i> " . $lang['2factorForce'] . "</div></div>";
     }
     $secret = $gauth->createSecret();
-    if (isset($settings['communityName'])) $name = urlencode(str_replace(' ', '', $settings['communityName']) . "CyberWorks");
-    else $name = 'CyberWorks';
+    if (isset($settings['communityName'])) {
+        $name = urlencode(str_replace(' ', '', $settings['communityName']) . "CyberWorks");
+    } else {
+        $name = 'CyberWorks';
+    }
     echo '<div class="col-md-6">' . $lang['2factorSetup1'] . '<br>' . $lang['2factorSetup2'] . ' <b>' . $secret . '</b><br><form method="post" action="2factor" class="form-inline">
   <label for="testCode">'.$lang['2factorSetup3'] . '<div class="form-group"></label><input style="margin-left: 5px;" class="form-control" id="testCode" type="text" name="testCode"></div>
   <input type="hidden" id="secret" name="secret" value="'.$secret . '"><button type="submit" class="btn btn-default">Verify</button>

Spacing +23 added lines, -23 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 if (isset($_GET['backup']) && $_SESSION['2factor'] == 2) {
     $backup = $gauth->createSecret(8);
-    $sql = "UPDATE `users` SET `backup`='" . $backup . "' WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+    $sql = "UPDATE `users` SET `backup`='".$backup."' WHERE `user_id` = '".$_SESSION['user_id']."';";
     $db_connection->query($sql);
-    message($lang['2factorBackup1'] . ' <b>' . $backup . '</b> ' . $lang['2factorBackup2']);
+    message($lang['2factorBackup1'].' <b>'.$backup.'</b> '.$lang['2factorBackup2']);
 } elseif (isset($_GET['revokeBackup']) && $_SESSION['2factor'] == 2) {
-    $sql = "UPDATE `users` SET `backup`=NULL WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+    $sql = "UPDATE `users` SET `backup`=NULL WHERE `user_id` = '".$_SESSION['user_id']."';";
     $db_connection->query($sql);
     message($lang['2factorBackupRevoke']);
 } elseif (isset($_GET['revoke']) && $_SESSION['2factor'] == 2) {
-    $sql = "UPDATE `users` SET `backup`=NULL,`twoFactor`=NULL,`token`=NULL WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+    $sql = "UPDATE `users` SET `backup`=NULL,`twoFactor`=NULL,`token`=NULL WHERE `user_id` = '".$_SESSION['user_id']."';";
     $db_connection->query($sql);
     unset($_COOKIE['token']);
     setcookie('token', '', time() - 3600, '/');
     $_SESSION['2factor'] = 0;
     message($lang['2factorRevoke']);
 } elseif (isset($_GET['remember']) && $_SESSION['2factor'] == 2 && !isset($_COOKIE['token'])) {
-    $sql = "SELECT `token` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+    $sql = "SELECT `token` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
     $token = $db_connection->query($sql)->fetch_object()->token;
     if (empty($token)) {
         $key = $gauth->createSecret(32);
-        $sql = "UPDATE `users` SET `token`='" . encrypt($key) . "' WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+        $sql = "UPDATE `users` SET `token`='".encrypt($key)."' WHERE `user_id` = '".$_SESSION['user_id']."';";
         $db_connection->query($sql);
         setcookie('token', $key, time() + 5184000, "/");
     } else {
@@ -33,12 +33,12 @@ 
     message($lang['2factorDeviceRevoke']);
 } elseif (isset($_GET['revokeToken']) && $_SESSION['2factor'] == 2) {
     if (isset($_COOKIE['token'])) unset($_COOKIE['token']);
-    $sql = "UPDATE `users` SET `token`='NULL' WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+    $sql = "UPDATE `users` SET `token`='NULL' WHERE `user_id` = '".$_SESSION['user_id']."';";
     $db_connection->query($sql);
     message($lang['2factorTokenRevoke']);
 } elseif (isset($_POST['testCode']) && isset($_POST['secret']) && $_SESSION['2factor'] == 0) {
     if ($gauth->verifyCode($_POST['secret'], $_POST['testCode'])) {
-    $sql = "UPDATE `users` SET `twoFactor`='" . $_POST['secret'] . "' WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+    $sql = "UPDATE `users` SET `twoFactor`='".$_POST['secret']."' WHERE `user_id` = '".$_SESSION['user_id']."';";
     $db_connection->query($sql);
     $_SESSION['2factor'] = 2;
     message($lang['2factor1']);
@@ -54,32 +54,32 @@ 
 <?php
 if ($_SESSION['2factor'] == 1 || $_SESSION['2factor'] == 5 || $_SESSION['2factor'] == 3) {
     if ($_SESSION['2factor'] == 3) message($lang['2factorError2']);
-    echo '<form method="post" action="' . $currentPage . '" class="form-inline">
-  <label for="code">'.$lang['2factorSetup3'] . '<div class="form-group"></label><input class="form-control" id="code" type="text" name="code"></div>
+    echo '<form method="post" action="'.$currentPage.'" class="form-inline">
+  <label for="code">'.$lang['2factorSetup3'].'<div class="form-group"></label><input class="form-control" id="code" type="text" name="code"></div>
   <button type="submit" class="btn btn-default">Verify</button></form>';
 } elseif ($_SESSION['2factor'] == 2) {
-    echo $lang['2factor1'] . '<br><br><a href="?backup" class="btn btn-default">';
-    $sql = "SELECT `backup`,`token` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+    echo $lang['2factor1'].'<br><br><a href="?backup" class="btn btn-default">';
+    $sql = "SELECT `backup`,`token` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
     $twoFactor = $db_connection->query($sql)->fetch_object();
-    if (isset($twoFactor->backup)) echo $lang['new'] . ' ' . $lang['2factor3']; else echo $lang['2factor3'];
+    if (isset($twoFactor->backup)) echo $lang['new'].' '.$lang['2factor3']; else echo $lang['2factor3'];
     echo '</a>';
-    echo '<a href="?revoke" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factor4'] . '</a>';
-    if (isset($twoFactor->token)) echo '<a href="?revokeToken" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factorTokenRevoke'] . '</a>';
-    if (isset($_COOKIE['token'])) echo '<a href="?revokeDevice" style="margin-left: 5px;" class="btn btn-danger">' . $lang['2factorRevokeRememberDevice'];
-    else echo '<a href="?remember" style="margin-left: 5px;" class="btn btn-primary">' . $lang['2factorRememberDevice'];
+    echo '<a href="?revoke" style="margin-left: 5px;" class="btn btn-danger">'.$lang['2factor4'].'</a>';
+    if (isset($twoFactor->token)) echo '<a href="?revokeToken" style="margin-left: 5px;" class="btn btn-danger">'.$lang['2factorTokenRevoke'].'</a>';
+    if (isset($_COOKIE['token'])) echo '<a href="?revokeDevice" style="margin-left: 5px;" class="btn btn-danger">'.$lang['2factorRevokeRememberDevice'];
+    else echo '<a href="?remember" style="margin-left: 5px;" class="btn btn-primary">'.$lang['2factorRememberDevice'];
     echo '</a>';
 
 } elseif ($_SESSION['2factor'] == 0 || $_SESSION['2factor'] == 5) {
     if ($_SESSION['2factor'] == 5) {
         echo "<div class='alert alert-danger alert-dismissable'>";
         echo "<button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>";
-        echo "<i class='fa fa-info-circle'></i> " . $lang['2factorForce'] . "</div></div>";
+        echo "<i class='fa fa-info-circle'></i> ".$lang['2factorForce']."</div></div>";
     }
     $secret = $gauth->createSecret();
-    if (isset($settings['communityName'])) $name = urlencode(str_replace(' ', '', $settings['communityName']) . "CyberWorks");
+    if (isset($settings['communityName'])) $name = urlencode(str_replace(' ', '', $settings['communityName'])."CyberWorks");
     else $name = 'CyberWorks';
-    echo '<div class="col-md-6">' . $lang['2factorSetup1'] . '<br>' . $lang['2factorSetup2'] . ' <b>' . $secret . '</b><br><form method="post" action="2factor" class="form-inline">
-  <label for="testCode">'.$lang['2factorSetup3'] . '<div class="form-group"></label><input style="margin-left: 5px;" class="form-control" id="testCode" type="text" name="testCode"></div>
-  <input type="hidden" id="secret" name="secret" value="'.$secret . '"><button type="submit" class="btn btn-default">Verify</button>
-  </form></div><div class="col-md-6"><img src="'.$gauth->getQRCodeGoogleUrl($name, $secret) . '"></div>';
+    echo '<div class="col-md-6">'.$lang['2factorSetup1'].'<br>'.$lang['2factorSetup2'].' <b>'.$secret.'</b><br><form method="post" action="2factor" class="form-inline">
+  <label for="testCode">'.$lang['2factorSetup3'].'<div class="form-group"></label><input style="margin-left: 5px;" class="form-control" id="testCode" type="text" name="testCode"></div>
+  <input type="hidden" id="secret" name="secret" value="'.$secret.'"><button type="submit" class="btn btn-default">Verify</button>
+  </form></div><div class="col-md-6"><img src="'.$gauth->getQRCodeGoogleUrl($name, $secret).'"></div>';
 }
\ No newline at end of file

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