Cyberbyte-Studios / CyberWorks

views/life/editPlayer.php

Indentation +93 added lines, -93 removed lines

@@ -156,7 +156,7 @@ 
 
       <div class="panel-body">
           <?php
-          $alias = str_replace('"[`', '', $player->aliases);
+            $alias = str_replace('"[`', '', $player->aliases);
     $alias = str_replace('`]"', '', $alias);
 
     echo '<center><img alt="'.$alias.'" src="'.$settings['url'].skinImage($player->civ_gear).'">';
@@ -173,11 +173,11 @@ 
         <i class="fa fa-2x fa-bank"></i>
         <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>';
-          } else {
-              echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-theme01'>".$lang['arrested'].'</button></h4>';
-          }
+            if ($player->arrested == 0) {
+                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>';
+            }
 
     if ($player->blacklist == 0) {
         echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-success'>".$lang['not'].' '.$lang['blacklisted'].'</button></h4>';
@@ -272,9 +272,9 @@ 
           </ul>
         </li>
           <?php
-          if ($_SESSION['permissions']['edit']['houses']) {
-              echo '<li><a href="#house" data-toggle="tab">'.$lang['houses'].'</a></li>';
-          }
+            if ($_SESSION['permissions']['edit']['houses']) {
+                echo '<li><a href="#house" data-toggle="tab">'.$lang['houses'].'</a></li>';
+            }
     if ($_SESSION['permissions']['edit']['vehicles']) {
         echo '<li><a href="#veh" data-toggle="tab">'.$lang['vehicles'].'</a></li>';
     }
@@ -291,57 +291,57 @@ 
         ?>
               <div class="tab-pane fade in active well" id="civ_lic">
                   <?php
-                  if ($player->civ_licenses !== '"[]"' && $player->civ_licenses !== '') {
-                      echo '<h4 style="centred">'.$lang['civil'].' '.$lang['licenses'].'</h4>';
-                      $return = stripArray($player->civ_licenses, 0);
-                      foreach ($return as $value) {
-                          if (strpos($value, '1') == true) {
-                              $name = before(',', $value);
-                              echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
-                          } else {
-                              $name = before(',', $value);
-                              echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
-                          }
-                      }
-                  } else {
-                      echo '<h4>'.errorMessage(371, $lang).'</h4>';
-                  } ?>
+                    if ($player->civ_licenses !== '"[]"' && $player->civ_licenses !== '') {
+                        echo '<h4 style="centred">'.$lang['civil'].' '.$lang['licenses'].'</h4>';
+                        $return = stripArray($player->civ_licenses, 0);
+                        foreach ($return as $value) {
+                            if (strpos($value, '1') == true) {
+                                $name = before(',', $value);
+                                echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
+                            } else {
+                                $name = before(',', $value);
+                                echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
+                            }
+                        }
+                    } else {
+                        echo '<h4>'.errorMessage(371, $lang).'</h4>';
+                    } ?>
               </div>
               <div class="tab-pane well fade" id="medic_lic">
                   <?php
-                  if ($player->med_licenses !== '"[]"' && $player->med_licenses !== '') {
-                      echo '<h4 style="centred">'.$lang['medic'].' '.$lang['licenses'].'</h4>';
-                      $return = stripArray($player->med_licenses, 0);
-                      foreach ($return as $value) {
-                          if (strpos($value, '1') == true) {
-                              $name = before(',', $value);
-                              echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
-                          } else {
-                              $name = before(',', $value);
-                              echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
-                          }
-                      }
-                  } else {
-                      echo '<h4>'.errorMessage(372, $lang).'</h4>';
-                  } ?>
+                    if ($player->med_licenses !== '"[]"' && $player->med_licenses !== '') {
+                        echo '<h4 style="centred">'.$lang['medic'].' '.$lang['licenses'].'</h4>';
+                        $return = stripArray($player->med_licenses, 0);
+                        foreach ($return as $value) {
+                            if (strpos($value, '1') == true) {
+                                $name = before(',', $value);
+                                echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
+                            } else {
+                                $name = before(',', $value);
+                                echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
+                            }
+                        }
+                    } else {
+                        echo '<h4>'.errorMessage(372, $lang).'</h4>';
+                    } ?>
               </div>
               <div class="tab-pane well fade" id="police_lic">
                   <?php
-                  if ($player->cop_licenses !== '"[]"' && $player->cop_licenses !== '') {
-                      $return = stripArray($player->cop_licenses, 0);
-                      echo '<h4 style="centred">'.$lang['cop'].' '.$lang['licenses'].'</h4>';
-                      foreach ($return as $value) {
-                          if (strpos($value, '1') == true) {
-                              $name = before(',', $value);
-                              echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
-                          } else {
-                              $name = before(',', $value);
-                              echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
-                          }
-                      }
-                  } else {
-                      echo '<h4>'.errorMessage(373, $lang).'</h4>';
-                  } ?>
+                    if ($player->cop_licenses !== '"[]"' && $player->cop_licenses !== '') {
+                        $return = stripArray($player->cop_licenses, 0);
+                        echo '<h4 style="centred">'.$lang['cop'].' '.$lang['licenses'].'</h4>';
+                        foreach ($return as $value) {
+                            if (strpos($value, '1') == true) {
+                                $name = before(',', $value);
+                                echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
+                            } else {
+                                $name = before(',', $value);
+                                echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license).'</button> ';
+                            }
+                        }
+                    } else {
+                        echo '<h4>'.errorMessage(373, $lang).'</h4>';
+                    } ?>
               </div>
             <?php
     }
@@ -349,43 +349,43 @@ 
         ?>
               <div class="tab-pane fade well" id="civ_inv">
                   <?php
-                  if ($player->civ_gear !== '"[]"' && $player->civ_gear !== '') {
-                      echo '<h4 style="centred">'.$lang['civil'].' '.$lang['gear'].'</h4>';
-                      echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>".$player->civ_gear.'</textarea><br>';
-
-                      if ($_SESSION['permissions']['edit']['inventory']) {
-                          echo '<a data-toggle="modal" href="#edit_civ_inv" class="btn btn-primary btn-xs" style="float: right;">';
-                          echo '<i class="fa fa-pencil"></i></a>';
-                      }
-                  } else {
-                      echo '<h4>'.errorMessage(381, $lang).'</h4>';
-                  } ?>
+                    if ($player->civ_gear !== '"[]"' && $player->civ_gear !== '') {
+                        echo '<h4 style="centred">'.$lang['civil'].' '.$lang['gear'].'</h4>';
+                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>".$player->civ_gear.'</textarea><br>';
+
+                        if ($_SESSION['permissions']['edit']['inventory']) {
+                            echo '<a data-toggle="modal" href="#edit_civ_inv" class="btn btn-primary btn-xs" style="float: right;">';
+                            echo '<i class="fa fa-pencil"></i></a>';
+                        }
+                    } else {
+                        echo '<h4>'.errorMessage(381, $lang).'</h4>';
+                    } ?>
               </div>
               <div class="tab-pane fade well" id="police_inv">
                   <?php
-                  if ($player->cop_gear !== '"[]"' && $player->cop_gear !== '') {
-                      echo '<h4 style="centred">'.$lang['cop'].' '.$lang['gear'].'</h4>';
-                      echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='cop_gear' name='cop_gear'>".$player->cop_gear.'</textarea><br>';
-                      if ($_SESSION['permissions']['edit']['inventory']) {
-                          echo '<a data-toggle="modal" href="#edit_cop_inv" class="btn btn-primary btn-xs" style="float: right;">';
-                          echo '<i class="fa fa-pencil"></i></a>';
-                      }
-                  } else {
-                      echo '<h4>'.errorMessage(383, $lang).'</h4>';
-                  } ?>
+                    if ($player->cop_gear !== '"[]"' && $player->cop_gear !== '') {
+                        echo '<h4 style="centred">'.$lang['cop'].' '.$lang['gear'].'</h4>';
+                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='cop_gear' name='cop_gear'>".$player->cop_gear.'</textarea><br>';
+                        if ($_SESSION['permissions']['edit']['inventory']) {
+                            echo '<a data-toggle="modal" href="#edit_cop_inv" class="btn btn-primary btn-xs" style="float: right;">';
+                            echo '<i class="fa fa-pencil"></i></a>';
+                        }
+                    } else {
+                        echo '<h4>'.errorMessage(383, $lang).'</h4>';
+                    } ?>
               </div>
               <div class="tab-pane fade well" id="medic_inv">
                   <?php
-                  if ($player->med_gear !== '"[]"' && $player->med_gear !== '') {
-                      echo '<h4 style="centred">'.$lang['medic'].' '.$lang['gear'].'</h4>';
-                      echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='med_gear' name='med_gear'>".$player->med_gear.'</textarea><br>';
-                      if ($_SESSION['permissions']['edit']['inventory']) {
-                          echo '<a data-toggle="modal" href="#edit_med_inv" class="btn btn-primary btn-xs" style="float: right;">';
-                          echo '<i class="fa fa-pencil"></i></a>';
-                      }
-                  } else {
-                      echo '<h4>'.errorMessage(382, $lang).'</h4>';
-                  } ?>
+                    if ($player->med_gear !== '"[]"' && $player->med_gear !== '') {
+                        echo '<h4 style="centred">'.$lang['medic'].' '.$lang['gear'].'</h4>';
+                        echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='med_gear' name='med_gear'>".$player->med_gear.'</textarea><br>';
+                        if ($_SESSION['permissions']['edit']['inventory']) {
+                            echo '<a data-toggle="modal" href="#edit_med_inv" class="btn btn-primary btn-xs" style="float: right;">';
+                            echo '<i class="fa fa-pencil"></i></a>';
+                        }
+                    } else {
+                        echo '<h4>'.errorMessage(382, $lang).'</h4>';
+                    } ?>
               </div>
             <?php
     }
@@ -727,16 +727,16 @@ 
             echo '<h4>'.$lang['cop'].': ';
             echo "<select id='player_coplvl' name='player_coplvl'>";
             for ($lvl = 0;
-                                 $lvl <= $settings['maxLevels']['cop'];
-                                 ++$lvl) {
+                                    $lvl <= $settings['maxLevels']['cop'];
+                                    ++$lvl) {
                 echo '<option value="'.$lvl.'"'.select($lvl, $player->coplevel).'>'.$lvl.'</option>';
             }
             echo '</select>';
             echo '<h4>'.$lang['medic'].': ';
             echo "<select id='player_medlvl' name='player_medlvl'>";
             for ($lvl = 0;
-                                 $lvl <= $settings['maxLevels']['medic'];
-                                 ++$lvl) {
+                                    $lvl <= $settings['maxLevels']['medic'];
+                                    ++$lvl) {
                 echo '<option value="'.$lvl.'"'.select($lvl, $player->mediclevel).'>'.$lvl.'</option>';
             }
             echo '</select>';
@@ -745,16 +745,16 @@ 
                 echo '<h4>'.$lang['admin'].': ';
                 echo "<select id='player_adminlvl' name='player_adminlvl'>";
                 for ($lvl = 0;
-                                     $lvl <= $settings['maxLevels']['admin'];
-                                     ++$lvl) {
+                                        $lvl <= $settings['maxLevels']['admin'];
+                                        ++$lvl) {
                     echo '<option value="'.$lvl.'"'.select($lvl, $player->adminlevel).'>'.$lvl.'</option>';
                 }
                 echo '</select>';
                 echo '<h4>'.$lang['donator'].': ';
                 echo "<select id='player_donlvl' name='player_donlvl'>";
                 for ($lvl = 0;
-                                     $lvl <= $settings['maxLevels']['donator'];
-                                     ++$lvl) {
+                                        $lvl <= $settings['maxLevels']['donator'];
+                                        ++$lvl) {
                     echo '<option value="'.$lvl.'"'.select($lvl, $player->$settings['donorFormat']).'>'.$lvl.'</option>';
                 }
                 echo '</select>';

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
       <div class="col-md-2 col-sm-2 box0">
         <div class="box1">
           <span class="fa fa-3x fa-usd"></span>
-          <h3> <?php $playerDonorLevel = $settings['donorFormat'];echo $lang['donator'].': '.$player->$playerDonorLevel; ?> </h3>
+          <h3> <?php $playerDonorLevel = $settings['donorFormat']; echo $lang['donator'].': '.$player->$playerDonorLevel; ?> </h3>
         </div>
       </div>
       <div class="col-md-2 col-sm-2 box0">

classes/rcon.php

Doc Comments +4 added lines, -4 removed lines

@@ -197,7 +197,7 @@ 
      * @throws \Exception if the connection is closed
      * @throws \Exception if sending the command failed
      *
-     * @return bool Whether sending the command was successful or not
+     * @return boolean|null Whether sending the command was successful or not
      */
     protected function send($command)
     {
@@ -226,7 +226,7 @@ 
     /**
      * Generates the password's CRC32 data
      *
-     * @return string
+     * @return string[]
      */
     private function getAuthCRC()
     {
@@ -239,7 +239,7 @@ 
      *
      * @param string $command The message which will be prepared for being sent to the server
      *
-     * @return string Message which can be sent to the server
+     * @return string[] Message which can be sent to the server
      */
     private function getMsgCRC($command)
     {
@@ -613,7 +613,7 @@ 
      * @author nerdalertdk (https://github.com/nerdalertdk)
      * @link https://github.com/Nizarii/arma-rcon-class-php/issues/4 The related GitHub issue
      *
-     * @param $str string
+     * @param string $str string
      *
      * @return string
      */

Spacing +5 added lines, -5 removed lines

@@ -164,7 +164,7 @@ 
             throw new \Exception('Failed to send login!');
         }
         $result = fread($this->socket, 16);
-        if (@ord($result[strlen($result)-1]) == 0) {
+        if (@ord($result[strlen($result) - 1]) == 0) {
             throw new \Exception('Login failed, wrong password or wrong port!');
         }
     }
@@ -231,7 +231,7 @@ 
     private function getAuthCRC()
     {
         $authCRC = sprintf('%x', crc32(chr(255).chr(00).trim($this->rconPassword)));
-        $authCRC = array(substr($authCRC,-2,2), substr($authCRC,-4,2), substr($authCRC,-6,2), substr($authCRC,0,2));
+        $authCRC = array(substr($authCRC, -2, 2), substr($authCRC, -4, 2), substr($authCRC, -6, 2), substr($authCRC, 0, 2));
         return $authCRC;
     }
     /**
@@ -244,7 +244,7 @@ 
     private function getMsgCRC($command)
     {
         $msgCRC = sprintf('%x', crc32(chr(255).chr(01).chr(hexdec(sprintf('%01b', 0))).$command));
-        $msgCRC = array(substr($msgCRC,-2,2),substr($msgCRC,-4,2),substr($msgCRC,-6,2),substr($msgCRC,0,2));
+        $msgCRC = array(substr($msgCRC, -2, 2), substr($msgCRC, -4, 2), substr($msgCRC, -6, 2), substr($msgCRC, 0, 2));
         return $msgCRC;
     }
     /**
@@ -599,9 +599,9 @@ 
         // Create return array
         $result = array();
         // Loop true the main arrays, each holding a value
-        foreach($str as $key => $value) {
+        foreach ($str as $key => $value) {
             // Combines each main value into new array
-            foreach($value as $keyLine => $line) {
+            foreach ($value as $keyLine => $line) {
                 $result[$keyLine][$key] = trim($line);
             }
         }

hooks/rcon_ban.php

Spacing +2 added lines, -2 removed lines

@@ -11,13 +11,13 @@
     $reason = clean((isset($_POST['REASON'])) ? $_POST['REASON'] : 0, "int");
 
 
-    $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
+    $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
     $result_of_query = $db_connection->query($sql);
     if ($result_of_query->num_rows == 1) {
         $server = $result_of_query->fetch_object();
         try
         {
-            $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int)decrypt($server->sq_port));
+            $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int) decrypt($server->sq_port));
             $answer = $rcon->banPlayer($rid, $reason, $time);
         }
         catch (Exception $e)

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
         {
             $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int)decrypt($server->sq_port));
             $answer = $rcon->banPlayer($rid, $reason, $time);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             echo $e->getMessage( );
         }

hooks/rcon_command.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
             {
                 $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int)decrypt($server->sq_port));
                 $answer = $rcon->command($cmd);
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 echo $e->getMessage( );
             }

Spacing +2 added lines, -2 removed lines

@@ -11,13 +11,13 @@
         $sid = clean($_POST['sid'], "int");
         $cmd = clean($_POST['command'], "string");
 
-        $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
+        $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
         $result_of_query = $db_connection->query($sql);
         if ($result_of_query->num_rows == 1) {
             $server = $result_of_query->fetch_object();
             try
             {
-                $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int)decrypt($server->sq_port));
+                $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int) decrypt($server->sq_port));
                 $answer = $rcon->command($cmd);
             }
             catch (Exception $e)

hooks/rcon_players.php

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 
             echo json_encode($answer);
 
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             echo $e->getMessage( );
             var_dump($e);

Spacing +2 added lines, -2 removed lines

@@ -5,13 +5,13 @@
 if (isset($_GET['sid'])) {
     $sid = clean($_GET['sid'], "int");
     $db_connection = masterConnect();
-    $sql = "SELECT `sq_ip`,`sq_port`,`rcon_pass` FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
+    $sql = "SELECT `sq_ip`,`sq_port`,`rcon_pass` FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
     $result_of_query = $db_connection->query($sql);
     if ($result_of_query->num_rows == 1) {
         $server = $result_of_query->fetch_object();
         try
         {
-            $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int)decrypt($server->sq_port));
+            $rcon = new \Nizarii\ARC(decrypt($server->sq_ip), decrypt($server->rcon_pass), (int) decrypt($server->sq_port));
             $answer = $rcon->getPlayersArray();
 
             echo json_encode($answer);

views/core/curPlayers.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-$sql = "SELECT `sid` FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
+$sql = "SELECT `sid` FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
 $result_of_query = $db_connection->query($sql);
 if ($result_of_query->num_rows == 1) { ?>
 <div class="row">
     <div class="col-lg-12">
         <h1 class="page-header">
             <?php echo $lang['players']; ?>
-            <small><?php echo " " . $lang['overview']; ?></small>
+            <small><?php echo " ".$lang['overview']; ?></small>
         </h1>
     </div>
 </div>
@@ -28,7 +28,7 @@ 
 }
 function getPlayers() {
     $.ajax({
-        url: "<?php echo $settings['url'] . 'hooks/rcon_players.php?sid=' . $sid ?>",
+        url: "<?php echo $settings['url'].'hooks/rcon_players.php?sid='.$sid ?>",
         dataType: 'json',
         complete: function(data) {
             var txt = '';
@@ -53,7 +53,7 @@ 
 	<div class="content-panel">
 		<table class="table table-striped table-advance table-hover">
 			<h4>
-				<i class="fa fa-child fa-fw"></i><?php echo " " . $lang['players']; ?>
+				<i class="fa fa-child fa-fw"></i><?php echo " ".$lang['players']; ?>
 				<div style="float:right; padding-right: 20px;" id="count"></div>
 			</h4>
 			<hr>