Completed
Pull Request — master (#71)
by Sam
11:59
created
gfunctions.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -362,8 +362,9 @@
 block discarded – undo
362 362
     $url .= "?s=$s&d=$d&r=$r";
363 363
     if ( $img ) {
364 364
         $url = '<img src="' . $url . '"';
365
-        foreach ( $atts as $key => $val )
366
-            $url .= ' ' . $key . '="' . $val . '"';
365
+        foreach ( $atts as $key => $val ) {
366
+                    $url .= ' ' . $key . '="' . $val . '"';
367
+        }
367 368
         $url .= ' />';
368 369
     }
369 370
     return $url;
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
@@ -46,12 +46,24 @@  discard block
 block discarded – undo
46 46
                     if ($result->num_rows > 0) {
47 47
                         $player = $result->fetch_object();
48 48
 
49
-                        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);
50
-                        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);
51
-                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
52
-                        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);
53
-                        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);
54
-                        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);
49
+                        if ($coplevel != $player->coplevel) {
50
+                            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);
51
+                        }
52
+                        if ($mediclevel != $player->mediclevel) {
53
+                            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);
54
+                        }
55
+                        if ($donorlevel != $player->$settings['donorFormat']) {
56
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
57
+                        }
58
+                        if ($adminlevel != $player->adminlevel) {
59
+                            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);
60
+                        }
61
+                        if ($cash != $player->cash) {
62
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
63
+                        }
64
+                        if ($bankacc != $player->bankacc) {
65
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
66
+                        }
55 67
 
56 68
                         $update = "UPDATE `players` SET coplevel = '$coplevel', mediclevel = '$mediclevel', " . $settings['donorFormat'] . "= '$donorlevel', adminlevel = '$adminlevel', cash = '$cash', bankacc = '$bankacc' WHERE `uid` = '$uID';";
57 69
                         $result_of_query = $db_link->query($update);
@@ -72,11 +84,21 @@  discard block
 block discarded – undo
72 84
                         if (is_null($donorlevel)) {
73 85
                             $donorlevel = $player->$settings['donorFormat'];
74 86
                         }
75
-                        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);
76
-                        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);
77
-                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
78
-                        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);
79
-                        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);
87
+                        if ($coplevel != $player->coplevel) {
88
+                            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);
89
+                        }
90
+                        if ($mediclevel != $player->mediclevel) {
91
+                            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);
92
+                        }
93
+                        if ($donorlevel != $player->$settings['donorFormat']) {
94
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
95
+                        }
96
+                        if ($cash != $player->cash) {
97
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
98
+                        }
99
+                        if ($bankacc != $player->bankacc) {
100
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
101
+                        }
80 102
 
81 103
                         $update = "UPDATE `players` SET coplevel = '$coplevel', mediclevel = '$mediclevel', " . $settings['donorFormat'] . "= '$donorlevel', cash = '$cash', bankacc = '$bankacc' WHERE `uid` = '$uID';";
82 104
                         $result_of_query = $db_link->query($update);
@@ -88,8 +110,12 @@  discard block
 block discarded – undo
88 110
                 } elseif ($_SESSION['user_level'] >= 2) {
89 111
                     $coplevel = intval($_POST["player_coplvl"]);
90 112
                     $mediclevel = intval($_POST["player_medlvl"]);
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);
113
+                    if ($coplevel != $player->coplevel) {
114
+                        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);
115
+                    }
116
+                    if ($mediclevel != $player->mediclevel) {
117
+                        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);
118
+                    }
93 119
 
94 120
                     $update = "UPDATE `players` SET coplevel = '$coplevel', mediclevel = '$mediclevel' WHERE `uid` = '$uID';";
95 121
                     $result_of_query = $db_link->query($update);
@@ -391,7 +417,10 @@  discard block
 block discarded – undo
391 417
                         </tbody>
392 418
                       </table>
393 419
                         <?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>';
394
-                    } else echo '<h4>' . errorMessage(31, $lang) . '</h4>'; ?>
420
+                    } else {
421
+                        echo '<h4>' . errorMessage(31, $lang) . '</h4>';
422
+                    }
423
+                    ?>
395 424
                 </div>
396 425
               </div>
397 426
             <?php }
@@ -437,7 +466,9 @@  discard block
 block discarded – undo
437 466
                         echo '</tr></tbody></table>';
438 467
                         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>';
439 468
 
440
-                    } else echo '<h4>' . errorMessage(32, $lang) . '</h4>';
469
+                    } else {
470
+                        echo '<h4>' . errorMessage(32, $lang) . '</h4>';
471
+                    }
441 472
                     ?>
442 473
                 </div>
443 474
               </div>
@@ -503,7 +534,9 @@  discard block
 block discarded – undo
503 534
 
504 535
                             }
505 536
                         }
506
-                    } else echo "<h3>" . errorMessage(34, $lang) . "</h3>";
537
+                    } else {
538
+                        echo "<h3>" . errorMessage(34, $lang) . "</h3>";
539
+                    }
507 540
                     ?>
508 541
 
509 542
                 </div>
@@ -544,7 +577,10 @@  discard block
 block discarded – undo
544 577
                 <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
545 578
               </div>
546 579
             </form>
547
-          <?php } else errorMessage(5, $lang); ?>
580
+          <?php } else {
581
+    errorMessage(5, $lang);
582
+}
583
+?>
548 584
       </div>
549 585
     </div>
550 586
   </div>
@@ -578,7 +614,10 @@  discard block
 block discarded – undo
578 614
                 <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
579 615
               </div>
580 616
             </form>
581
-          <?php } else errorMessage(5, $lang); ?>
617
+          <?php } else {
618
+    errorMessage(5, $lang);
619
+}
620
+?>
582 621
       </div>
583 622
     </div>
584 623
   </div>
@@ -612,7 +651,10 @@  discard block
 block discarded – undo
612 651
                 <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
613 652
               </div>
614 653
             </form>
615
-          <?php } else errorMessage(5, $lang); ?>
654
+          <?php } else {
655
+    errorMessage(5, $lang);
656
+}
657
+?>
616 658
       </div>
617 659
     </div>
618 660
   </div>
@@ -645,7 +687,10 @@  discard block
 block discarded – undo
645 687
                 <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
646 688
               </div>
647 689
             </form>
648
-          <?php } else errorMessage(5, $lang); ?>
690
+          <?php } else {
691
+    errorMessage(5, $lang);
692
+}
693
+?>
649 694
       </div>
650 695
     </div>
651 696
   </div>
@@ -719,7 +764,10 @@  discard block
 block discarded – undo
719 764
                 <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
720 765
               </div>
721 766
             </form>
722
-          <?php } else "<h1>" . errorMessage(5, $lang) . "/<h1>"; ?>
767
+          <?php } else {
768
+    "<h1>" . errorMessage(5, $lang) . "/<h1>";
769
+}
770
+?>
723 771
       </div>
724 772
     </div>
725 773
   </div>
@@ -765,4 +813,6 @@  discard block
 block discarded – undo
765 813
     });
766 814
   </script>
767 815
 
768
-<?php } else echo "<h1>" . errorMessage(36, $lang) . "</h1>";
769 816
\ No newline at end of file
817
+<?php } else {
818
+    echo "<h1>" . errorMessage(36, $lang) . "</h1>";
819
+}
Please login to merge, or discard this patch.
views/steam/life/player.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -299,7 +299,9 @@
 block discarded – undo
299 299
                                 echo '</tbody></table>';
300 300
                                 echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"> More</a>';
301 301
 
302
-                            } else  echo errorMessage(31, $lang);
302
+                            } else {
303
+                                echo errorMessage(31, $lang);
304
+                            }
303 305
                         ?>
304 306
                         </div>
305 307
                     </div>
Please login to merge, or discard this patch.