Completed
Pull Request — master (#82)
by
unknown
02:28
created
views/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/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/templates/search.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 </style>
8 8
 
9 9
 <div class="form-inline pull-right-md">
10
-    <form id="search" name='rows' method="post" action="<?php echo $settings['url'] . $currentPage ?>">
10
+    <form id="search" name='rows' method="post" action="<?php echo $settings['url'].$currentPage ?>">
11 11
 
12 12
             <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>">
13 13
             <input id="searchButton" style='margin-right: 10px;' class='btn btn-primary' type='button' name='search' onclick='searchpage();' value='<?php echo $lang['search'] ?>'>
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,14 +9,18 @@
 block discarded – undo
9 9
 <div class="form-inline pull-right-md">
10 10
     <form id="search" name='rows' method="post" action="<?php echo $settings['url'] . $currentPage ?>">
11 11
 
12
-            <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>">
12
+            <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) {
13
+    echo $search ?>">
13 14
             <input id="searchButton" style='margin-right: 10px;' class='btn btn-primary' type='button' name='search' onclick='searchpage();' value='<?php echo $lang['search'] ?>'>
14 15
     </form>
15 16
     <select style="margin-right:15px;" onchange="if (this.value) window.location.href='?items='+this.value" id='items' class="form-control" name='items'>
16 17
         <?php
17 18
         foreach ($settings['item'] as $item) {
18 19
             echo '<option value="'.$item.'"';
19
-            if ($item == $_SESSION['items']) echo ' selected';
20
+}
21
+            if ($item == $_SESSION['items']) {
22
+                echo ' selected';
23
+            }
20 24
             echo '>'.$item.'</option>';
21 25
         }
22 26
         ?>
Please login to merge, or discard this patch.