Cyberbyte-Studios / CyberWorks

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

Spacing +2 added lines, -2 removed lines

@@ -12,13 +12,13 @@
         $rid = clean((isset($_POST['id'])) ? $_POST['id'] : 0, "int");
         $cmd = clean((isset($_POST['command'])) ? $_POST['command'] : 0, "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)

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( );
             }

hooks/rcon_players.php

Spacing +2 added lines, -2 removed lines

@@ -5,13 +5,13 @@
 if (isset($_GET['sid'])) {
     $sid = clean((isset($_GET['sid'])) ? $_GET['sid'] : 0, "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);

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);

views/life/editPlayer.php

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">

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>

views/core/newServer.php

Spacing +10 added lines, -10 removed lines

@@ -5,10 +5,10 @@ 
         if ($dbid == 'none') {
             $server_type = 'life';
 
-            $sql = "INSERT INTO `db` (`type`, `sql_host`, `sql_user`, `sql_pass`, `sql_name`) VALUES ('" . $server_type . "', '" . $settings['db']['host'] . "', '" . $settings['db']['user'] . "', '" . $settings['db']['pass'] . "', '" . $settings['db']['name'] . "');";
+            $sql = "INSERT INTO `db` (`type`, `sql_host`, `sql_user`, `sql_pass`, `sql_name`) VALUES ('".$server_type."', '".$settings['db']['host']."', '".$settings['db']['user']."', '".$settings['db']['pass']."', '".$settings['db']['name']."');";
             $result_of_query = $db_connection->query($sql);
 
-            $sql = "SELECT `dbid` FROM `db` WHERE `sql_name` = '" . $SQL_name . "';";
+            $sql = "SELECT `dbid` FROM `db` WHERE `sql_name` = '".$SQL_name."';";
             $result_of_query = $db_connection->query($sql);
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 $dbid = $row['dbid'];
@@ -27,11 +27,11 @@ 
                 $server_RCON_pass = encrypt($_POST['server_RCON_pass']);
 
                 $sql = "INSERT INTO `servers` (`name`, `dbid`, `type`, `use_sq`, `sq_port`,`sq_ip`, `rcon_pass`) VALUES
-                ('" . $server_name . "', '" . $dbid . "', '" . $server_type . "', '" . $server_SQ . "', '" . $server_SQ_port . "', '" . $server_SQ_host . "', '" . $server_RCON_pass . "');";
+                ('" . $server_name."', '".$dbid."', '".$server_type."', '".$server_SQ."', '".$server_SQ_port."', '".$server_SQ_host."', '".$server_RCON_pass."');";
             }
         } else {
             $sql = "INSERT INTO `servers` (`name`, `dbid`, `type`, `use_sq`) VALUES
-                ('" . $server_name . "', '" . $dbid . "', '" . $server_type . "', '" . $server_SQ . "');";
+                ('" . $server_name."', '".$dbid."', '".$server_type."', '".$server_SQ."');";
         }
 
         $result_of_query = $db_connection->query($sql);
@@ -46,13 +46,13 @@ 
         <form method="post" action="newServer" name="newServer" id="newServer">
             <?php echo formtoken::getField() ?>
             <h2 class="form-login-heading">
-                <?php echo $lang['new'] . ' ' . $lang['gameServers'] ?>
+                <?php echo $lang['new'].' '.$lang['gameServers'] ?>
             </h2>
             <div class="form-group">
                 <label for="server_name">Server Name: </label>
                 <input placeholder="Server Name" id="server_name" class=" form-control login_input" type="text" name="server_name"
                     <?php if (isset($_POST['server_name'])) {
-    echo 'value="' . $_POST['server_name'] . '"' ?>
+    echo 'value="'.$_POST['server_name'].'"' ?>
                        autocorrect="off" required>
                 </div>
                 <div class="form-group">
@@ -75,19 +75,19 @@ 
                     <input placeholder="SQ IP" id="server_SQ_host"
                        class=" form-control login_input" type="text"
                        name="server_SQ_host"
-                        <?php if (isset($_POST['server_SQ_host'])) echo 'value="' . $_POST['server_SQ_host'] . '"' ?> autocorrect="off" autocapitalize="off">
+                        <?php if (isset($_POST['server_SQ_host'])) echo 'value="'.$_POST['server_SQ_host'].'"' ?> autocorrect="off" autocapitalize="off">
                     </div>
                     <div class="form-group">
                         <label for="server_SQ_port">SQ port: </label>
                         <input placeholder="SQ Port" id="server_SQ_port"
                        class=" form-control login_input" type="text"
                        name="server_SQ_port"
-                            <?php if (isset($_POST['server_SQ_port'])) echo 'value="' . $_POST['server_SQ_port'] . '"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
+                            <?php if (isset($_POST['server_SQ_port'])) echo 'value="'.$_POST['server_SQ_port'].'"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
                         </div>
                         <div class="form-group">
                             <label for="server_RCON_pass">RCON Password: </label>
                             <input placeholder="RCON Password" id="server_RCON_pass" class=" form-control login_input" type="password" name="server_RCON_pass"
-                                <?php if (isset($_POST['server_RCON_pass'])) echo 'value="' . $_POST['server_RCON_pass'] . '"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
+                                <?php if (isset($_POST['server_RCON_pass'])) echo 'value="'.$_POST['server_RCON_pass'].'"' ?> autocorrect="off" autocapitalize="off" autocomplete="off">
                             </div>
                             </div>
                             <?php
@@ -98,7 +98,7 @@ 
                     echo '<div class="form-group"><label for="server_dbid">Database: </label>';
                     echo '<select id="server_dbid" name="server_dbid" class="form-control login_input">';
                     while ($row = mysqli_fetch_assoc($result_of_query)) {
-                        echo '<option value="' . $row['id'] . '">' . $row['name'] . '</option>';
+                        echo '<option value="'.$row['id'].'">'.$row['name'].'</option>';
                     }
                     echo '</select></div>';
                 } else {