Completed
Push — master ( 3d3b9a...9e5156 )
by Sam
14s
created
views/life/squad.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,15 +10,15 @@
 block discarded – undo
10 10
 <picture>logo.paa</picture>
11 11
 title>CZ</title>';
12 12
 
13
-$sql = "SELECT `name`,`members` FROM `gangs` WHERE `id` = '" . $id . "';";
13
+$sql = "SELECT `name`,`members` FROM `gangs` WHERE `id` = '".$id."';";
14 14
 $result = $db_link->query($sql);
15 15
 $gang = $result->fetch_object();
16 16
 $members = str_replace('`]"', '', str_replace('"[`', '', $gang->members));
17 17
 $members = explode('`,`', $members);
18 18
 foreach ($members as $member) {
19 19
     $name = nameID($member);
20
-    $xml .= '<member id="' . $member . '" nick="' . $name . '">
21
-    <name>'.$name . '</name><email></email><icq></icq><remark></remark></member>';
20
+    $xml .= '<member id="'.$member.'" nick="'.$name.'">
21
+    <name>'.$name.'</name><email></email><icq></icq><remark></remark></member>';
22 22
 };
23 23
 
24 24
 $xml .= '</squad>';
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
views/steam/life/nav.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
         if ($settings['url'] == "/") {
32 32
             include("views/steam/life/nav.php");
33 33
         } else {
34
-            include(realpath($settings['url']) . "views/steam/life/nav.php");
34
+            include(realpath($settings['url'])."views/steam/life/nav.php");
35 35
         }
36 36
 	
37 37
     }
Please login to merge, or discard this patch.
views/steam/life/editVeh.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@  discard block
 block discarded – undo
3 3
     require_once("config/carNames.php");
4 4
     require_once("config/images.php");
5 5
 } else {
6
-    require_once(realpath($settings['url']) . "config/carNames.php");
7
-    require_once(realpath($settings['url']) . "config/images.php");
6
+    require_once(realpath($settings['url'])."config/carNames.php");
7
+    require_once(realpath($settings['url'])."config/images.php");
8 8
 }
9 9
 
10 10
 $db_link = serverConnect();
11 11
 
12
-$sql = "SELECT * FROM `vehicles` WHERE `id` ='" . $vehID . "';";
12
+$sql = "SELECT * FROM `vehicles` WHERE `id` ='".$vehID."';";
13 13
 $result_of_query = $db_link->query($sql);
14 14
 if ($result_of_query->num_rows > 0) {
15 15
     $veh = $result_of_query->fetch_object();
@@ -18,31 +18,31 @@  discard block
 block discarded – undo
18 18
     <div class="panel panel-default">
19 19
         <div class="panel-heading">
20 20
             <h2 class="panel-title"><i
21
-                    class="fa fa-child fa-fw"></i><?php echo nameID($veh->pid, $db_link) . "'s " . carName($veh->classname); ?>
21
+                    class="fa fa-child fa-fw"></i><?php echo nameID($veh->pid, $db_link)."'s ".carName($veh->classname); ?>
22 22
             </h2>
23 23
         </div>
24 24
         <div class="panel-body">
25 25
             <?php $carPic = getPic($veh->classname);
26
-            echo '<center><img src="' . $settings['url'] . 'assets/img/cars/' . $carPic . '.jpg" class="img-responsive" alt="' . $veh->classname . '">'; ?>
26
+            echo '<center><img src="'.$settings['url'].'assets/img/cars/'.$carPic.'.jpg" class="img-responsive" alt="'.$veh->classname.'">'; ?>
27 27
             <?php
28
-            echo "<h4>" . $lang['owner'] . ": " . nameID($veh->pid, $db_link) . "</h4>";
29
-            echo "<h4>" . $lang['class'] . ": " . carName($veh->classname) . "</h4>";
30
-            echo "<h4>" . $lang['plate'] . ": " . $veh->plate . "</h4>";
28
+            echo "<h4>".$lang['owner'].": ".nameID($veh->pid, $db_link)."</h4>";
29
+            echo "<h4>".$lang['class'].": ".carName($veh->classname)."</h4>";
30
+            echo "<h4>".$lang['plate'].": ".$veh->plate."</h4>";
31 31
 
32 32
             if ($veh->alive == false) {
33
-                echo "<h4><span class='label label-danger'>" . $lang["not"] . " " . $lang["alive"] . "</span> ";
33
+                echo "<h4><span class='label label-danger'>".$lang["not"]." ".$lang["alive"]."</span> ";
34 34
             } else {
35
-                echo "<h4><span class='label label-success'>" . $lang["alive"] . "</span> ";
35
+                echo "<h4><span class='label label-success'>".$lang["alive"]."</span> ";
36 36
             }
37 37
 
38 38
             if ($veh->active == false) {
39
-                echo " <span class='label label-danger'>" . $lang["not"] . " " . $lang["active"] . "</span></h4>";
39
+                echo " <span class='label label-danger'>".$lang["not"]." ".$lang["active"]."</span></h4>";
40 40
             } else {
41
-                echo " <span class='label label-success'>" . $lang["active"] . "</span></h4>";
41
+                echo " <span class='label label-success'>".$lang["active"]."</span></h4>";
42 42
             }
43 43
 
44 44
             } else {
45
-                echo "<h1>" . $lang['noRes'] . "</h1>";
45
+                echo "<h1>".$lang['noRes']."</h1>";
46 46
             }
47 47
             echo "</center>";
48 48
             ?>
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             case 'civ':
60 60
                 ?>
61 61
                 <span class="fa fa-3x fa-car"></span>
62
-                <h4> <?php echo $lang['side'] . ": " . $lang['civ']; ?> </h4>
62
+                <h4> <?php echo $lang['side'].": ".$lang['civ']; ?> </h4>
63 63
                 <?php
64 64
                 break;
65 65
             case 'cop':
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
                 <div class="col-md-2 col-sm-2 col-md-offset-1 box0">
68 68
                     <div class="box1">
69 69
                         <span class="fa fa-3x fa-taxi"></span>
70
-                        <h4> <?php echo $lang['side'] . ": " . $lang['police']; ?> </h4>
70
+                        <h4> <?php echo $lang['side'].": ".$lang['police']; ?> </h4>
71 71
                     </div>
72 72
                 </div>
73 73
                 <?php
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             case 'med':
76 76
                 ?>
77 77
                 <span class="fa fa-3x fa-ambulance"></span>
78
-                <h4> <?php echo $lang['side'] . ": " . $lang['medic']; ?> </h4>
78
+                <h4> <?php echo $lang['side'].": ".$lang['medic']; ?> </h4>
79 79
                 <?php
80 80
                 break;
81 81
         }
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
         switch ($veh->type) {
86 86
             case 'Car':
87 87
                 echo "<span class='fa fa-3x fa-car'></span>";
88
-                echo "<h4>" . $lang['type'] . ": " . $lang['car'] . "</h4>";
88
+                echo "<h4>".$lang['type'].": ".$lang['car']."</h4>";
89 89
                 break;
90 90
             case 'Air':
91 91
                 echo "<span class='fa fa-3x fa-fighter-jet'></span>";
92
-                echo "<h4>" . $lang['type'] . ": " . $lang['air'] . "</h4>";
92
+                echo "<h4>".$lang['type'].": ".$lang['air']."</h4>";
93 93
                 break;
94 94
             case 'Ship':
95 95
                 echo "<span class='fa fa-3x fa-ship'></span>";
96
-                echo "<h4>" . $lang['type'] . ": " . $lang['ship'] . "</h4>";
96
+                echo "<h4>".$lang['type'].": ".$lang['ship']."</h4>";
97 97
                 break;
98 98
         }
99 99
         echo '</div>
@@ -103,13 +103,13 @@  discard block
 block discarded – undo
103 103
 
104 104
         <div class="panel panel-default" style="float:left; width:100%; margin:0 auto;">
105 105
             <div class="panel-body">
106
-                <h4 style="centred"><?php echo $lang['vehicle'] . " " . $lang['inventory']; ?> </h4>
106
+                <h4 style="centred"><?php echo $lang['vehicle']." ".$lang['inventory']; ?> </h4>
107 107
                 <?php
108 108
                 $inv = str_replace(']"', "", str_replace('"[', "", $veh->inventory));
109 109
                 if (empty($inv)) {
110 110
                     $inv = 'Empty';
111 111
                 }
112
-                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>" . $inv . "</textarea>";
112
+                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>".$inv."</textarea>";
113 113
                 ?>
114 114
                 <br>
115 115
                 <br>
Please login to merge, or discard this patch.
views/steam/errors/noData.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1 1
 <?php
2
-echo "<h1>" . $lang['noRec'] . "</h1>";
3 2
\ No newline at end of file
3
+echo "<h1>".$lang['noRec']."</h1>";
4 4
\ No newline at end of file
Please login to merge, or discard this patch.
views/error.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,11 +10,11 @@
 block discarded – undo
10 10
             <?php
11 11
             if ($login->messages) {
12 12
                 foreach ($login->messages as $message) {
13
-                    echo '<div style="margin-top: 200px;" class="alert alert-info animated infinite bounce" role="alert">' . $message . '</div>';
13
+                    echo '<div style="margin-top: 200px;" class="alert alert-info animated infinite bounce" role="alert">'.$message.'</div>';
14 14
                 }
15 15
             } elseif ($login->errors) {
16 16
                 foreach ($login->errors as $error) {
17
-                    echo '<div style="margin-top: 200px;" class="alert alert-danger animated infinite bounce" role="alert">' . $error . '</div>';
17
+                    echo '<div style="margin-top: 200px;" class="alert alert-danger animated infinite bounce" role="alert">'.$error.'</div>';
18 18
                 }
19 19
             } else echo '<div style="margin-top: 270px;"></div>' ?>
20 20
         </div>
Please login to merge, or discard this patch.
views/templates/head.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
     <?php
23 23
     if (isset($settings)) {
24 24
         foreach ($settings['plugins'] as &$plugin) {
25
-            if (file_exists("plugins/" . $plugin . "/assets/style.css")) {
26
-                echo '<link rel="stylesheet" type="text/css" href="' . $settings['url'] . 'plugins/' . $plugin . '/assets/style.css">';
25
+            if (file_exists("plugins/".$plugin."/assets/style.css")) {
26
+                echo '<link rel="stylesheet" type="text/css" href="'.$settings['url'].'plugins/'.$plugin.'/assets/style.css">';
27 27
             }
28 28
         }
29 29
     } ?>
Please login to merge, or discard this patch.
views/templates/error.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-echo "<h1>" . $err . "</h1>";
4 3
\ No newline at end of file
4
+echo "<h1>".$err."</h1>";
5 5
\ No newline at end of file
Please login to merge, or discard this patch.
views/core/login.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -15,20 +15,20 @@  discard block
 block discarded – undo
15 15
     if (formtoken::validateToken($_POST)) {
16 16
         $to = $_POST['emailed'];
17 17
         $token = tokenGen(32);
18
-        $sql = "SELECT  `user_id` FROM `users` WHERE  `user_email` =  '" . $to . "';";
18
+        $sql = "SELECT  `user_id` FROM `users` WHERE  `user_email` =  '".$to."';";
19 19
         $result = $db_connection->query($sql);
20 20
         if ($result->num_rows > 0) {
21 21
             $row = $result->fetch_assoc();
22
-            $sql = "UPDATE  `users` SET  `token` =  '" . $token . "' WHERE  `user_id` = '" . $row['user_id'] . "';";
22
+            $sql = "UPDATE  `users` SET  `token` =  '".$token."' WHERE  `user_id` = '".$row['user_id']."';";
23 23
             $result_of_query = $db_connection->query($sql);
24 24
 
25 25
             //Send the reset Email
26 26
             $subject = "Password Reset";
27
-            $headers = "MIME-Version: 1.0" . "\r\n";
28
-            $headers .= "Content-type:text/html;charset=iso-8859-1" . "\r\n";
27
+            $headers = "MIME-Version: 1.0"."\r\n";
28
+            $headers .= "Content-type:text/html;charset=iso-8859-1"."\r\n";
29 29
             //$headers .= "From: Password Reset <[email protected]>\r\n";
30
-            $headers .= "From: " . $settings['community'] . " Panel <" . $email . ">\r\n" . "Reply-To: " . $email . "\r\n";
31
-            $msg = "Password reset<br/> token: " . $token . " <br/> url: <a href='" . $settings['url'] . "?token=" . $token . "&uID=" . $row['user_id'] . "'>" . $settings['url'] . "?token=" . $token . "&uID=" . $row['user_id'] . "</a>";
30
+            $headers .= "From: ".$settings['community']." Panel <".$email.">\r\n"."Reply-To: ".$email."\r\n";
31
+            $msg = "Password reset<br/> token: ".$token." <br/> url: <a href='".$settings['url']."?token=".$token."&uID=".$row['user_id']."'>".$settings['url']."?token=".$token."&uID=".$row['user_id']."</a>";
32 32
             $mail = mail($to, $subject, $msg, $headers);
33 33
 
34 34
             $message = "Your password has been reset please check your email";
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
         if ($_POST['user_password_new'] !== $_POST['user_password_repeat']) {
43 43
             $error = 'Password and password repeat are not the same';
44 44
         } else {
45
-            $sql = "SELECT `user_id` FROM `users` WHERE  `user_id` = '" . $_GET['uID'] . "' AND `token` =  '" . $_GET['token'] . "';";
45
+            $sql = "SELECT `user_id` FROM `users` WHERE  `user_id` = '".$_GET['uID']."' AND `token` =  '".$_GET['token']."';";
46 46
             $result_of_query = $db_connection->query($sql);
47 47
             if ($result_of_query->num_rows == 1) {
48 48
                 $user_password_hash = password_hash($_POST['user_password_new'], PASSWORD_DEFAULT);
49
-                $sql = "UPDATE `users` SET `user_password_hash` =  '" . $user_password_hash . "', `token` = '' WHERE  `user_id` = '" . $_GET['uID'] . "' AND `token` =  '" . $_GET['token'] . "';";
49
+                $sql = "UPDATE `users` SET `user_password_hash` =  '".$user_password_hash."', `token` = '' WHERE  `user_id` = '".$_GET['uID']."' AND `token` =  '".$_GET['token']."';";
50 50
                 $result_of_query = $db_connection->query($sql);
51 51
                 $message = 'Your password been updated';
52 52
             } else {
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
             }
55 55
         }
56 56
     } else {
57
-    $sql = "SELECT `user_id` FROM `users` WHERE  `user_id` = '" . $_GET['uID'] . "' AND `token` =  '" . $_GET['token'] . "';";
57
+    $sql = "SELECT `user_id` FROM `users` WHERE  `user_id` = '".$_GET['uID']."' AND `token` =  '".$_GET['token']."';";
58 58
     $result_of_query = $db_connection->query($sql);
59 59
     if ($result_of_query->num_rows == 1) {
60 60
 ?>
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 <?php
92 92
         } else {
93 93
             $error = 'User not found or token invalid';
94
-            logAction($_POST['email'], ' ' . $lang['passreset'], 3);
94
+            logAction($_POST['email'], ' '.$lang['passreset'], 3);
95 95
         }
96 96
     }
97 97
 }
@@ -106,16 +106,16 @@  discard block
 block discarded – undo
106 106
             <?php
107 107
             if ($login->messages) {
108 108
                 foreach ($login->messages as $message) {
109
-                    echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">' . $message . '</div>';
109
+                    echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">'.$message.'</div>';
110 110
                 }
111 111
             } elseif ($login->errors) {
112 112
                 foreach ($login->errors as $error) {
113
-                    echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">' . $error . '</div>';
113
+                    echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">'.$error.'</div>';
114 114
                 }
115 115
             } elseif (isset($message)) {
116
-                echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">' . $message . '</div>';
116
+                echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">'.$message.'</div>';
117 117
             } elseif (isset($error)) {
118
-                echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">' . $error . '</div>';
118
+                echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">'.$error.'</div>';
119 119
             } else {
120 120
                 echo '<div style="margin-top: 190px;"></div>';
121 121
             } ?>
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
                                         echo '<select id = "lang" name = "lang" class="form-control login_input" >';
162 162
 
163 163
                                         foreach ($settings['installedLanguage'] as $language) {
164
-                                            echo '<option value = "' . $language[1] . '" ';
164
+                                            echo '<option value = "'.$language[1].'" ';
165 165
                                             if ($tempLang == $language[1]) {
166 166
                                                 echo 'selected';
167 167
                                             }
168
-                                            echo '> ' . $language[0] . '</option>';
168
+                                            echo '> '.$language[0].'</option>';
169 169
                                         }
170 170
                                     echo '</select><br>';
171 171
                                     }
Please login to merge, or discard this patch.
views/core/newDB.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
     if (formtoken::validateToken($_POST)) {
4 4
         $db_type = $_POST['db_type'];
5 5
     
6
-        $sql = "INSERT INTO `db` (`type`, `sql_host`, `sql_user`, `sql_pass`, `sql_name`) VALUES ('" . $db_type . "', '" . encrypt($_POST['SQL_host']) . "', '" . encrypt($_POST['SQL_user']) . "', '" . encrypt($_POST['SQL_pass']) . "', '" . encrypt($_POST['SQL_name']) . "');";
6
+        $sql = "INSERT INTO `db` (`type`, `sql_host`, `sql_user`, `sql_pass`, `sql_name`) VALUES ('".$db_type."', '".encrypt($_POST['SQL_host'])."', '".encrypt($_POST['SQL_user'])."', '".encrypt($_POST['SQL_pass'])."', '".encrypt($_POST['SQL_name'])."');";
7 7
         $result_of_query = $db_connection->query($sql);
8 8
     
9 9
         message($lang['newdb']);
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
         <form method="post" action="newDB" name="newDB" id="newDB">
18 18
             <?php echo formtoken::getField() ?>
19 19
             <h2 class="form-login-heading">
20
-                <?php echo $lang['new'] . ' ' . $lang['database'] ?>
20
+                <?php echo $lang['new'].' '.$lang['database'] ?>
21 21
             </h2>
22 22
             <div class="form-group">
23 23
                 <label for="db_type">Server type: </label>
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
                        class=" form-control login_input" type="text"
33 33
                        name="SQL_host"
34 34
 
35
-                    <?php if (isset($_POST['SQL_host'])) echo 'value="' . htmlspecialchars($_POST['SQL_host']) . '"' ?>
35
+                    <?php if (isset($_POST['SQL_host'])) echo 'value="'.htmlspecialchars($_POST['SQL_host']).'"' ?>
36 36
                        required>
37 37
                 </div>
38 38
                 <div class="form-group">
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
                     <input placeholder="SQL User" id="SQL_user"
41 41
                        class=" form-control login_input" type="text"
42 42
                        name="SQL_user"
43
-                        <?php if (isset($_POST['SQL_user'])) echo 'value="' . htmlspecialchars($_POST['SQL_user']) . '"' ?>
43
+                        <?php if (isset($_POST['SQL_user'])) echo 'value="'.htmlspecialchars($_POST['SQL_user']).'"' ?>
44 44
                        required autocapitalize="off">
45 45
                     </div>
46 46
                     <div class="form-group">
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
                        class=" form-control login_input" type="password"
50 50
                        name="SQL_pass"
51 51
 
52
-                            <?php if (isset($_POST['SQL_pass'])) echo 'value="' . htmlspecialchars($_POST['SQL_pass']) . '"' ?>
52
+                            <?php if (isset($_POST['SQL_pass'])) echo 'value="'.htmlspecialchars($_POST['SQL_pass']).'"' ?>
53 53
                        required autocapitalize="off" autocomplete="off">
54 54
                         </div>
55 55
                         <div class="form-group">
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
                        class=" form-control login_input" type="text"
59 59
                        name="SQL_name"
60 60
 
61
-                                <?php if (isset($_POST['SQL_name'])) echo 'value="' . htmlspecialchars($_POST['SQL_name']) . '"' ?>
61
+                                <?php if (isset($_POST['SQL_name'])) echo 'value="'.htmlspecialchars($_POST['SQL_name']).'"' ?>
62 62
                        required>
63 63
                             </div>
64 64
                             <input class="btn btn-lg btn-primary" style="float:right;" type="submit" name="setup"
Please login to merge, or discard this patch.