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/rcon.php

Doc Comments +9 added lines

@@ -1,4 +1,7 @@ 
 <?php
+/**
+ * @param string $string
+ */
 function strToHex($string)
 {
     $hex = '';
@@ -46,6 +49,9 @@ 
     return $sign . $h;
 }
 
+/**
+ * @param string $cs
+ */
 function get_checksum($cs)
 {
     $var = computeUnsignedCRC32($cs);
@@ -61,6 +67,9 @@ 
     return chr($d) . chr($c) . chr($b) . chr($a);
 }
 
+/**
+ * @param string $answer
+ */
 function fixAnswer($answer)
 {
 

Spacing +19 added lines, -19 removed lines

@@ -14,7 +14,7 @@ 
     $string = '';
     for ($i = 0; $i < strlen($hex) - 1; $i += 2)
     {
-        $string .= chr(hexdec($hex[$i] . $hex[$i + 1]));
+        $string .= chr(hexdec($hex[$i].$hex[$i + 1]));
     }
     return $string;
 }
@@ -38,12 +38,12 @@ 
 
     do
     {
-        $h = $hex[($dec % 16)] . $h;
+        $h = $hex[($dec % 16)].$h;
         $dec /= 16;
     }
     while ($dec >= 1);
 
-    return $sign . $h;
+    return $sign.$h;
 }
 
 function get_checksum($cs)
@@ -51,14 +51,14 @@ 
     $var = computeUnsignedCRC32($cs);
     $x = ('0x');
     $a = substr($var, 0, 2);
-    $a = $x . $a;
+    $a = $x.$a;
     $b = substr($var, 2, 2);
-    $b = $x . $b;
+    $b = $x.$b;
     $c = substr($var, 4, 2);
-    $c = $x . $c;
+    $c = $x.$c;
     $d = substr($var, 6, 2);
-    $d = $x . $d;
-    return chr($d) . chr($c) . chr($b) . chr($a);
+    $d = $x.$d;
+    return chr($d).chr($c).chr($b).chr($a);
 }
 
 function fixAnswer($answer)
@@ -95,15 +95,15 @@ 
 
 function rcon($serverip, $serverport, $rconpassword, $cmd)
 {
-    $passhead = chr(0xFF) . chr(0x00);
-    $head = chr(0x42) . chr(0x45);
-    $pass = $passhead . $rconpassword;
+    $passhead = chr(0xFF).chr(0x00);
+    $head = chr(0x42).chr(0x45);
+    $pass = $passhead.$rconpassword;
     $answer = "";
     $checksum = get_checksum($pass);
 
-    $loginmsg = $head . $checksum . $pass;
+    $loginmsg = $head.$checksum.$pass;
 
-    $rcon = fsockopen("udp://" . $serverip, $serverport, $errno, $errstr, 1);
+    $rcon = fsockopen("udp://".$serverip, $serverport, $errno, $errstr, 1);
     stream_set_timeout($rcon, 1);
 
     if (!$rcon) {
@@ -112,12 +112,12 @@ 
         fwrite($rcon, $loginmsg);
         $res = fread($rcon, 16);
 
-        $cmdhead = chr(0xFF) . chr(0x01) . chr(0x00);
+        $cmdhead = chr(0xFF).chr(0x01).chr(0x00);
         //$cmd = "Players";
-        $cmd = $cmdhead . $cmd;
+        $cmd = $cmdhead.$cmd;
         $checksum = get_checksum($cmd);
-        $cmdmsg = $head . $checksum . $cmd;
-        $hlen = strlen($head . $checksum . chr(0xFF) . chr(0x01));
+        $cmdmsg = $head.$checksum.$cmd;
+        $hlen = strlen($head.$checksum.chr(0xFF).chr(0x01));
 
         fwrite($rcon, $cmdmsg);
         $answer = fread($rcon, 102400);
@@ -129,9 +129,9 @@ 
             }
         }
         $cmd = "Exit";
-        $cmd = $cmdhead . $cmd;
+        $cmd = $cmdhead.$cmd;
         $checksum = get_checksum($cmd);
-        $cmdmsg = $head . $checksum . $cmd;
+        $cmdmsg = $head.$checksum.$cmd;
         fwrite($rcon, $cmdmsg);
     }
 

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/steam/life/cars.php

Braces +9 added lines, -3 removed lines

@@ -10,13 +10,17 @@ 
     $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%'" . $max . " ;";
 } else {
     $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' " . $max . " ;";
 }
 $result_of_query = $db_link->query($sql);
@@ -74,4 +78,6 @@ 
     </table>
 </div>
 <?php
-} else echo errorMessage(3, $lang);
\ No newline at end of file
+} else {
+    echo errorMessage(3, $lang);
+}

Spacing +13 added lines, -13 removed lines

@@ -2,22 +2,22 @@ 
 $db_link = serverConnect();
 require_once("config/carNames.php");
 
-$max = 'LIMIT ' . ($pageNum - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
+$max = 'LIMIT '.($pageNum - 1) * $_SESSION['items'].','.$_SESSION['items'];
 
 if (isset($search)) {
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['vehicles'], 1);
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['vehicles'], 1);
 
-    $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.$playerIdColumn WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%$search%' OR `name` LIKE '%$search%' OR `plate` LIKE '$search' OR `inventory` LIKE '%$search%';";
+    $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.$playerIdColumn WHERE `pid` LIKE '".$_SESSION['playerid']."' OR `classname` LIKE '%$search%' OR `name` LIKE '%$search%' OR `plate` LIKE '$search' OR `inventory` LIKE '%$search%';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.$playerIdColumn WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%$search%' OR `name` LIKE '%$search%' OR `plate` LIKE '$search' OR `inventory` LIKE '%$search%' $max;";
+    $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.$playerIdColumn WHERE `pid` LIKE '".$_SESSION['playerid']."' OR `classname` LIKE '%$search%' OR `name` LIKE '%$search%' OR `plate` LIKE '$search' OR `inventory` LIKE '%$search%' $max;";
 } else {
-    $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "';";
+    $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '".$_SESSION['playerid']."';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.$playerIdColumn WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' $max;";
+    $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.$playerIdColumn WHERE `pid` LIKE '".$_SESSION['playerid']."' $max;";
 }
 $result_of_query = $db_link->query($sql);
 if ($result_of_query->num_rows > 0) {  ?>
@@ -54,14 +54,14 @@ 
             <?php
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 echo "<tr>";
-                echo "<td>" . nameID($row["pid"], $db_link) . "</td>";
-                echo "<td>" . carName($row["classname"]) . "</td>";
-                echo "<td class='hidden-xs'> " . carType($row["type"], $lang) . "</td>";
-                echo "<td class='hidden-xs'> " . $row["plate"] . "</td>";
-                echo "<td class='hidden-xs'> " . yesNo($row["alive"], $lang) . "</td>";
-                echo "<td class='hidden-xs'> " . yesNo($row["active"], $lang) . "</td>";
+                echo "<td>".nameID($row["pid"], $db_link)."</td>";
+                echo "<td>".carName($row["classname"])."</td>";
+                echo "<td class='hidden-xs'> ".carType($row["type"], $lang)."</td>";
+                echo "<td class='hidden-xs'> ".$row["plate"]."</td>";
+                echo "<td class='hidden-xs'> ".yesNo($row["alive"], $lang)."</td>";
+                echo "<td class='hidden-xs'> ".yesNo($row["active"], $lang)."</td>";
                 if ($row["pid"] == $_SESSION['playerid']) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $row["id"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editVeh/".$row["id"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 }
                 echo "</tr>";

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/settings.php

Braces +6 added lines, -2 removed lines

@@ -70,7 +70,9 @@ 
             <?php
             foreach ($settings['installedLanguage'] as $language) {
                 echo '<option value = "' . $language[1] . '" ';
-                if ($settings['language'] == $language[1]) echo 'selected';
+                if ($settings['language'] == $language[1]) {
+                    echo 'selected';
+                }
                 echo '> ' . $language[0] . '</option>';
             } ?>
         </select></div>
@@ -196,7 +198,9 @@ 
     <span class='input-group-btn'><button style='margin-top: 21px;' class='btn btn-default reveal' type='button'><i class='fa fa-eye-slash'></i></button></span></div>
 
     <?php
-    if (!isset($pluginSettings)) echo '<h3>' . $lang['plugin'] . ' ' . $lang['settings'] . '</h3>';
+    if (!isset($pluginSettings)) {
+        echo '<h3>' . $lang['plugin'] . ' ' . $lang['settings'] . '</h3>';
+    }
     foreach ($settings['plugins'] as &$plugin) {
         if (file_exists("plugins/" . $plugin . "/settings.php")) {
             include("plugins/" . $plugin . "/settings.php");

Spacing +39 added lines, -39 removed lines

@@ -15,11 +15,11 @@ 
             $settings['allowLang'] = filter_var($_POST['allowLang'], FILTER_VALIDATE_BOOLEAN);
             $settings['wanted'] = filter_var($_POST['wanted'], FILTER_VALIDATE_BOOLEAN);
             $settings['news'] = filter_var($_POST['news'], FILTER_VALIDATE_BOOLEAN);
-            $settings['register'] =  filter_var($_POST['register'], FILTER_VALIDATE_BOOLEAN);
-            $settings['steamlogin'] =  filter_var($_POST['steamlogin'], FILTER_VALIDATE_BOOLEAN);
+            $settings['register'] = filter_var($_POST['register'], FILTER_VALIDATE_BOOLEAN);
+            $settings['steamlogin'] = filter_var($_POST['steamlogin'], FILTER_VALIDATE_BOOLEAN);
             $settings['vacTest'] = filter_var($_POST['vacTest'], FILTER_VALIDATE_BOOLEAN);
-            $settings['performance'] =  filter_var($_POST['performance'], FILTER_VALIDATE_BOOLEAN);
-            $settings['notifications'] =  filter_var($_POST['notifications'], FILTER_VALIDATE_BOOLEAN);
+            $settings['performance'] = filter_var($_POST['performance'], FILTER_VALIDATE_BOOLEAN);
+            $settings['notifications'] = filter_var($_POST['notifications'], FILTER_VALIDATE_BOOLEAN);
             
             $settings['2factor'] = false;
             $settings['gravatar'] = false;
@@ -31,9 +31,9 @@ 
             $settings['maxLevels']['donator'] = $_POST['max_donator'];
 
             
-            file_put_contents('config/settings.php', '<?php return ' . var_export($settings, true) . ';');
+            file_put_contents('config/settings.php', '<?php return '.var_export($settings, true).';');
         } else {
-            logAction($_SESSION['user_name'], $lang['failedUpdate'] . ' ' . $lang['server'] . ' ' . $lang['settings'], 3);
+            logAction($_SESSION['user_name'], $lang['failedUpdate'].' '.$lang['server'].' '.$lang['settings'], 3);
         }
     } else {
         message($lang['expired']);
@@ -53,13 +53,13 @@ 
     <form method='post' action='settings' id='settings' name='settingsEdit'>
         <?php
         echo formtoken::getField();
-        echo "<h3>" . $lang['database'] . "</h3>";
-        echo "<div class='form-group'><label for='db_host'>" . $lang['database'] . " " . $lang['host'] . ": </label><input class='form-control' id='db_host' type='text' name='db_host' value='" . decrypt($settings['db']['host']) . "' readonly></div>";
-        echo "<div class='form-group'><label for='db_user'>" . $lang['database'] . " " . $lang['user'] . ": </label><input class='form-control' id='db_user' type='text' name='db_user' value='" . decrypt($settings['db']['user']) . "' readonly></div>";
-        echo "<div class='form-group'><div class='input-group'><label for='db_pass'>" . $lang['database'] . " " . $lang['password'] . ": </label><input class='form-control pwd' id='db_pass' type='password' name='db_pass' value='" . decrypt($settings['db']['pass']) . "' readonly>";
+        echo "<h3>".$lang['database']."</h3>";
+        echo "<div class='form-group'><label for='db_host'>".$lang['database']." ".$lang['host'].": </label><input class='form-control' id='db_host' type='text' name='db_host' value='".decrypt($settings['db']['host'])."' readonly></div>";
+        echo "<div class='form-group'><label for='db_user'>".$lang['database']." ".$lang['user'].": </label><input class='form-control' id='db_user' type='text' name='db_user' value='".decrypt($settings['db']['user'])."' readonly></div>";
+        echo "<div class='form-group'><div class='input-group'><label for='db_pass'>".$lang['database']." ".$lang['password'].": </label><input class='form-control pwd' id='db_pass' type='password' name='db_pass' value='".decrypt($settings['db']['pass'])."' readonly>";
         echo "<span class='input-group-btn'><button style='margin-top: 21px; 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='db_name'>" . $lang['database'] . " " . $lang['name'] . ": </label><input class='form-control' id='db_name' type='text' name='db_name' value='" . decrypt($settings['db']['name']) . "' readonly></div>";
+        echo "<div class='form-group'><label for='db_name'>".$lang['database']." ".$lang['name'].": </label><input class='form-control' id='db_name' type='text' name='db_name' value='".decrypt($settings['db']['name'])."' readonly></div>";
         ?>
 
     <h3><?php echo $lang['panel']?></h3>
@@ -71,16 +71,16 @@ 
         <select name="language" id="language" class="form-control">
             <?php
             foreach ($settings['installedLanguage'] as $language) {
-                echo '<option value = "' . $language[1] . '" ';
+                echo '<option value = "'.$language[1].'" ';
                 if ($settings['language'] == $language[1]) echo 'selected';
-                echo '> ' . $language[0] . '</option>';
+                echo '> '.$language[0].'</option>';
             } ?>
         </select></div>
 
     <div class='form-group'><label for="allowLang"><?php echo $lang['allowLang'] ?>: </label>
         <select name="allowLang" id="allowLang" class="form-control">
-            <option value="true"<?php echo select(true, $settings['allowLang']) . '>' . $lang['yes'] ?></option>
-            <option value="false"<?php echo select(false, $settings['allowLang']) . '>' . $lang['no'] ?></option>
+            <option value="true"<?php echo select(true, $settings['allowLang']).'>'.$lang['yes'] ?></option>
+            <option value="false"<?php echo select(false, $settings['allowLang']).'>'.$lang['no'] ?></option>
         </select></div>
         
     <?php } ?>
@@ -88,9 +88,9 @@ 
     <div class='form-group'><label for="performance"><?php echo $lang['performance'] ?>: </label>
         <select name="performance" id="performance" class="form-control">
             <option value="true"
-            <?php echo select(true, $settings['performance']) . '>' . $lang['yes'] ?></option>
+            <?php echo select(true, $settings['performance']).'>'.$lang['yes'] ?></option>
             <option value="false"
-            <?php echo select(false, $settings['performance']) . '>' . $lang['no'] ?></option>
+            <?php echo select(false, $settings['performance']).'>'.$lang['no'] ?></option>
         </select></div>
 
     <div class='form-group'><label for="items"><?php echo $lang['itemsPP'] ?></label>
@@ -104,38 +104,38 @@ 
 
     <div class='form-group'><label for="register"><?php echo $lang['registration'] ?>: </label>
         <select name="register" id="register" class="form-control">
-        <option value="true"<?php echo select(true, $settings['register']) . '>' . $lang['yes'] ?></option>
-        <option value="false"<?php echo select(false, $settings['register']) . '>' . $lang['no'] ?></option>
+        <option value="true"<?php echo select(true, $settings['register']).'>'.$lang['yes'] ?></option>
+        <option value="false"<?php echo select(false, $settings['register']).'>'.$lang['no'] ?></option>
     </select>
     </div>
 
     <div class='form-group'><label for="news"><?php echo $lang['useNews'] ?>: </label>
         <select name="news" id="news" class="form-control">
-        <option value="true"<?php echo select(true, $settings['news']) . '>' . $lang['yes'] ?></option>
-        <option value="false"<?php echo select(false, $settings['news']) . '>' . $lang['no'] ?></option>
+        <option value="true"<?php echo select(true, $settings['news']).'>'.$lang['yes'] ?></option>
+        <option value="false"<?php echo select(false, $settings['news']).'>'.$lang['no'] ?></option>
     </select></div>
 
     <div class='form-group'><label for="notifications">Notifications: </label>
         <select name="notifications" id="notifications" class="form-control">
-        <option value="true"<?php echo select(true, $settings['notifications']) . '>' . $lang['yes'] ?></option>
-        <option value="false"<?php echo select(false, $settings['notifications']) . '>' . $lang['no'] ?></option>
+        <option value="true"<?php echo select(true, $settings['notifications']).'>'.$lang['yes'] ?></option>
+        <option value="false"<?php echo select(false, $settings['notifications']).'>'.$lang['no'] ?></option>
     </select></div>
-    <?php echo "<div class='form-group'><label for='refresh'>" . $lang['refresh'] . ": </label><input class='form-control' id='refresh' type='number' name='refresh' value='" . $settings['refresh'] . "'></div>"; ?>
+    <?php echo "<div class='form-group'><label for='refresh'>".$lang['refresh'].": </label><input class='form-control' id='refresh' type='number' name='refresh' value='".$settings['refresh']."'></div>"; ?>
 </div>
 <div class="col-md-6">
     <h3>Altis Life</h3>
     <?php
-    echo "<div class='form-group'><label for='max_cop'>" . $lang['max'] . " " . $lang['cop'] . " " . $lang['level'] . ": </label><input class='form-control' id='max_cop' type='number' name='max_cop' value='" . $settings['maxLevels']['cop'] . "'></div>";
-    echo "<div class='form-group'><label for='max_medic'>" . $lang['max'] . " " . $lang['medic'] . " " . $lang['level'] . ": </label><input class='form-control' id='max_medic' type='number' name='max_medic' value='" . $settings['maxLevels']['medic'] . "'></div>";
-    echo "<div class='form-group'><label for='max_admin'>" . $lang['max'] . " " . $lang['admin'] . " " . $lang['level'] . ": </label><input class='form-control' id='max_admin' type='number' name='max_admin' value='" . $settings['maxLevels']['admin'] . "'></div>";
-    echo "<div class='form-group'><label for='max_donator'>" . $lang['max'] . " " . $lang['donator'] . " " . $lang['level'] . ": </label><input class='form-control' id='max_donator' type='number' name='max_donator' value='" . $settings['maxLevels']['donator'] . "'></div>";
+    echo "<div class='form-group'><label for='max_cop'>".$lang['max']." ".$lang['cop']." ".$lang['level'].": </label><input class='form-control' id='max_cop' type='number' name='max_cop' value='".$settings['maxLevels']['cop']."'></div>";
+    echo "<div class='form-group'><label for='max_medic'>".$lang['max']." ".$lang['medic']." ".$lang['level'].": </label><input class='form-control' id='max_medic' type='number' name='max_medic' value='".$settings['maxLevels']['medic']."'></div>";
+    echo "<div class='form-group'><label for='max_admin'>".$lang['max']." ".$lang['admin']." ".$lang['level'].": </label><input class='form-control' id='max_admin' type='number' name='max_admin' value='".$settings['maxLevels']['admin']."'></div>";
+    echo "<div class='form-group'><label for='max_donator'>".$lang['max']." ".$lang['donator']." ".$lang['level'].": </label><input class='form-control' id='max_donator' type='number' name='max_donator' value='".$settings['maxLevels']['donator']."'></div>";
     ?>
     <div class='form-group'><label for="wanted"><?php echo $lang['wanted'] ?>: </label>
         <select name="wanted" id="wanted" class="form-control">
             <option value="true"
-            <?php echo select(true, $settings['wanted']) . '>' . $lang['yes'] ?></option>
+            <?php echo select(true, $settings['wanted']).'>'.$lang['yes'] ?></option>
             <option value="false"
-            <?php echo select(false, $settings['wanted']) . '>' . $lang['no'] ?></option>
+            <?php echo select(false, $settings['wanted']).'>'.$lang['no'] ?></option>
         </select></div>
 
     <div class='form-group'>
@@ -163,35 +163,35 @@ 
     <div class='form-group'><label for="steamlogin"><?php echo $lang['steamlogin'] ?>: </label>
         <select name="steamlogin" id="steamlogin" class="form-control">
         <option value="true"
-        <?php echo select(true, $settings['steamlogin']) . '>' . $lang['yes'] ?></option>
+        <?php echo select(true, $settings['steamlogin']).'>'.$lang['yes'] ?></option>
         <option value="false"
-        <?php echo select(false, $settings['steamlogin']) . '>' . $lang['no'] ?></option>
+        <?php echo select(false, $settings['steamlogin']).'>'.$lang['no'] ?></option>
     </select></div>
 
     <div class='form-group'><label for="vacTest"><?php echo $lang['useVAC'] ?>: </label>
         <select name="vacTest" id="vacTest" class="form-control">
         <option value="true"
-        <?php echo select(true, $settings['vacTest']) . '>' . $lang['yes'] ?></option>
+        <?php echo select(true, $settings['vacTest']).'>'.$lang['yes'] ?></option>
         <option value="false"
-        <?php echo select(false, $settings['vacTest']) . '>' . $lang['no'] ?></option>
+        <?php echo select(false, $settings['vacTest']).'>'.$lang['no'] ?></option>
     </select></div>
 
     <div class='form-group'><label for="communityBansTest"><?php echo $lang['useCommunityBans'] ?>: </label>
         <select name="communityBansTest" id="communityBansTest" class="form-control">
         <option value="true"
-        <?php echo select(true, $settings['communityBansTest']) . '>' . $lang['yes'] ?></option>
+        <?php echo select(true, $settings['communityBansTest']).'>'.$lang['yes'] ?></option>
         <option value="false"
-        <?php echo select(false, $settings['communityBansTest']) . '>' . $lang['no'] ?></option>
+        <?php echo select(false, $settings['communityBansTest']).'>'.$lang['no'] ?></option>
     </select></div>
 
     <div class='form-group'><div class='input-group'><label for='communityBansAPI'>Community Bans API <?php echo $lang['key'] ?>: </label><input class='form-control pwd' id='communityBansAPI' type='password' name='communityBansAPI' value='<?php echo $settings['communityBansAPI']?>'>
     <span class='input-group-btn'><button style='margin-top: 21px;' class='btn btn-default reveal' type='button'><i class='fa fa-eye-slash'></i></button></span></div>
 
     <?php
-    if (!isset($pluginSettings)) echo '<h3>' . $lang['plugin'] . ' ' . $lang['settings'] . '</h3>';
+    if (!isset($pluginSettings)) echo '<h3>'.$lang['plugin'].' '.$lang['settings'].'</h3>';
     foreach ($settings['plugins'] as &$plugin) {
-        if (file_exists("plugins/" . $plugin . "/settings.php")) {
-            include("plugins/" . $plugin . "/settings.php");
+        if (file_exists("plugins/".$plugin."/settings.php")) {
+            include("plugins/".$plugin."/settings.php");
         }
     }
     ?>