Completed
Push — master ( ac04d5...f7aa57 )
by Sam
02:51
created
views/firstTime.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 RewriteBase /'.$base . '
32 32
 RewriteCond %{REQUEST_FILENAME} !-f
33 33
 RewriteRule . /'.$base . 'index.php [L]';
34
-    file_put_contents('.htaccess',$hta);
34
+    file_put_contents('.htaccess', $hta);
35 35
 
36 36
     $settings['id'] = 1001;
37 37
     $settings['community'] = $_POST['community_name'];
@@ -110,21 +110,21 @@  discard block
 block discarded – undo
110 110
     $settings['communityBansTest'] = false;
111 111
     $settings['communityBansAPI'] = '';
112 112
 
113
-    $settings['item'] = array(5,10,15,25,50);
113
+    $settings['item'] = array(5, 10, 15, 25, 50);
114 114
 
115
-    $settings['installedLanguage']=array();
116
-    $langEn = array('English','en');
117
-    $langDe = array('German','de');
115
+    $settings['installedLanguage'] = array();
116
+    $langEn = array('English', 'en');
117
+    $langDe = array('German', 'de');
118 118
     array_push($settings['installedLanguage'], $langEn);
119 119
     array_push($settings['installedLanguage'], $langDe);
120 120
 
121 121
     $settings['names'] = array('', 'Dave', 'Sam', 'Joe', 'Kerry', 'Connie', 'Jess');
122
-    $settings['ranks'] = array('Banned','Player','Member','Moderator','Server Admin','Super Admin');
122
+    $settings['ranks'] = array('Banned', 'Player', 'Member', 'Moderator', 'Server Admin', 'Super Admin');
123 123
 
124 124
     $permissions = include 'config/permissions.php';
125 125
     $userPerms = json_encode($permissions['5']);
126 126
 
127
-    $link = mysqli_connect($server_SQL_host,$server_SQL_user,$server_SQL_pass,$server_SQL_name);
127
+    $link = mysqli_connect($server_SQL_host, $server_SQL_user, $server_SQL_pass, $server_SQL_name);
128 128
     if (mysqli_connect_errno()) {
129 129
         printf("Connect failed: %s\n", mysqli_connect_error());
130 130
         exit();
Please login to merge, or discard this patch.
views/life/editPlayer.php 1 patch
Braces   +72 added lines, -22 removed lines patch added patch discarded remove patch
@@ -63,12 +63,24 @@  discard block
 block discarded – undo
63 63
                     if ($result->num_rows > 0) {
64 64
                         $player = $result->fetch_object();
65 65
 
66
-                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
67
-                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
68
-                        if ($donatorlvl != $player->donatorlvl) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
69
-                        if ($adminlevel != $player->adminlevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel . ") " . $lang['to'] . " (" . $adminlevel . ")", 2);
70
-                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
71
-                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
66
+                        if ($coplevel != $player->coplevel) {
67
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
68
+                        }
69
+                        if ($mediclevel != $player->mediclevel) {
70
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
71
+                        }
72
+                        if ($donatorlvl != $player->donatorlvl) {
73
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
74
+                        }
75
+                        if ($adminlevel != $player->adminlevel) {
76
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel . ") " . $lang['to'] . " (" . $adminlevel . ")", 2);
77
+                        }
78
+                        if ($cash != $player->cash) {
79
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
80
+                        }
81
+                        if ($bankacc != $player->bankacc) {
82
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
83
+                        }
72 84
 
73 85
                         $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', donatorlvl = '" . $donatorlvl . "', adminlevel = '" . $adminlevel . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "', arrested = '" . $arrested . "', blacklist = '" . $blacklist . "' WHERE `uid` = '" . $uID . "' ";
74 86
                         $result_of_query = $db_link->query($update);
@@ -88,11 +100,21 @@  discard block
 block discarded – undo
88 100
                     $result = $db_link->query($sql);
89 101
                     if ($result->num_rows > 0) {
90 102
                         $player = $result->fetch_object();
91
-                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
92
-                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
93
-                        if ($donatorlvl != $player->donatorlvl) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
94
-                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
95
-                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
103
+                        if ($coplevel != $player->coplevel) {
104
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
105
+                        }
106
+                        if ($mediclevel != $player->mediclevel) {
107
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
108
+                        }
109
+                        if ($donatorlvl != $player->donatorlvl) {
110
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
111
+                        }
112
+                        if ($cash != $player->cash) {
113
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
114
+                        }
115
+                        if ($bankacc != $player->bankacc) {
116
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
117
+                        }
96 118
 
97 119
                         $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', donatorlvl = '" . $donatorlvl . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "', arrested = '" . $arrested . "' WHERE `uid` = '" . $uID . "' ";
98 120
                         $result_of_query = $db_link->query($update);
@@ -104,8 +126,12 @@  discard block
 block discarded – undo
104 126
                 } elseif ($_SESSION['user_level'] >= 2) {
105 127
                     $coplevel = intval($_POST["player_coplvl"]);
106 128
                     $mediclevel = intval($_POST["player_medlvl"]);
107
-                    if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
108
-                    if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
129
+                    if ($coplevel != $player->coplevel) {
130
+                        logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
131
+                    }
132
+                    if ($mediclevel != $player->mediclevel) {
133
+                        logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
134
+                    }
109 135
                                             
110 136
                     $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "' WHERE `uid` = '" . $uID . "' ";
111 137
                     $result_of_query = $db_link->query($update);
@@ -411,7 +437,10 @@  discard block
 block discarded – undo
411 437
                                     </tbody>
412 438
                                 </table>
413 439
                                 <?php echo '<a style="float: right;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
414
-                            } else echo '<h4>' . errorMessage(31, $lang) . '</h4>'; ?>
440
+                            } else {
441
+                                echo '<h4>' . errorMessage(31, $lang) . '</h4>';
442
+                            }
443
+                            ?>
415 444
                         </div>
416 445
                     </div>
417 446
                 <?php } if ($_SESSION['permissions']['view']['vehicles'] || $player->playerid == $_SESSION['playerid']) { ?>
@@ -443,7 +472,9 @@  discard block
 block discarded – undo
443 472
                                 echo '</tr></tbody></table>';
444 473
                                 echo '<a style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
445 474
 
446
-                            } else echo '<h4>' . errorMessage(32, $lang) . '</h4>';
475
+                            } else {
476
+                                echo '<h4>' . errorMessage(32, $lang) . '</h4>';
477
+                            }
447 478
                         ?>
448 479
                         </div>
449 480
                     </div>
@@ -508,7 +539,9 @@  discard block
 block discarded – undo
508 539
 
509 540
                                     }
510 541
                                 }
511
-                            } else echo "<h3>" . errorMessage(34, $lang) . "</h3>";
542
+                            } else {
543
+                                echo "<h3>" . errorMessage(34, $lang) . "</h3>";
544
+                            }
512 545
                         ?>
513 546
 
514 547
                         </div>
@@ -548,7 +581,10 @@  discard block
 block discarded – undo
548 581
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
549 582
                     </div>
550 583
                 </form>
551
-            <?php } else errorMessage(5, $lang); ?>
584
+            <?php } else {
585
+    errorMessage(5, $lang);
586
+}
587
+?>
552 588
         </div>
553 589
     </div>
554 590
 </div>
@@ -581,7 +617,10 @@  discard block
 block discarded – undo
581 617
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
582 618
                     </div>
583 619
                 </form>
584
-            <?php } else errorMessage(5, $lang); ?>
620
+            <?php } else {
621
+    errorMessage(5, $lang);
622
+}
623
+?>
585 624
         </div>
586 625
     </div>
587 626
 </div>
@@ -614,7 +653,10 @@  discard block
 block discarded – undo
614 653
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
615 654
                     </div>
616 655
                 </form>
617
-            <?php } else errorMessage(5, $lang); ?>
656
+            <?php } else {
657
+    errorMessage(5, $lang);
658
+}
659
+?>
618 660
         </div>
619 661
     </div>
620 662
 </div>
@@ -647,7 +689,10 @@  discard block
 block discarded – undo
647 689
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
648 690
                     </div>
649 691
                 </form>
650
-            <?php } else errorMessage(5, $lang); ?>
692
+            <?php } else {
693
+    errorMessage(5, $lang);
694
+}
695
+?>
651 696
         </div>
652 697
     </div>
653 698
 </div>
@@ -760,9 +805,14 @@  discard block
 block discarded – undo
760 805
                     <?php }?>
761 806
                 });
762 807
                 </script>
763
-            <?php } else "<h1>" . errorMessage(5, $lang) . "/<h1>"; ?>
808
+            <?php } else {
809
+    "<h1>" . errorMessage(5, $lang) . "/<h1>";
810
+}
811
+?>
764 812
         </div>
765 813
     </div>
766 814
 </div>
767 815
 
768
-<?php } else echo "<h1>" . errorMessage(36, $lang) . "</h1>";
816
+<?php } else {
817
+    echo "<h1>" . errorMessage(36, $lang) . "</h1>";
818
+}
Please login to merge, or discard this patch.