Fixes to queries and removed usage of $this

Author: Sam Collins

Dockerfile

@@ -0,0 +1,10 @@
+FROM php:5-apache
+RUN apt-get update && apt-get install -y \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libmcrypt-dev \
+        libpng12-dev
+
+RUN a2enmod rewrite
+
+RUN docker-php-ext-install -j$(nproc) mysqli mcrypt

config/images.php

@@ -2,7 +2,7 @@
 
 function skinImage($uniform)
 {
-    $playerSkin = $this->getPlayerSkin(stripArray($uniform, 3));
+    $playerSkin = getPlayerSkin(stripArray($uniform, 3));
     return "assets/img/uniform/$playerSkin.jpg";
 }
 

docker-compose.yml

@@ -2,9 +2,9 @@ version: '2'
 
 services:
   php:
-    image: php:5-apache
+    build: .
     ports:
-      - 80:80
+      - 80
     volumes:
       - .:/var/www/html
 

index.php

@@ -1,6 +1,6 @@
 <?php
 error_reporting(0);
-error_reporting(E_ALL); // Turn on for error messages
+//error_reporting(E_ALL); // Turn on for error messages
 
 session_name('CyberWorks');
 session_set_cookie_params(1209600);
@@ -17,7 +17,12 @@
 
 if (file_exists('config/settings.php')) {
     $settings = require_once 'config/settings.php';
-    $playerIdColumn = $settings['playerColumn'];
+
+    if (isset($settings['playerColumn'])) {
+        $playerIdColumn = $settings['playerColumn'];
+    } else {
+        $playerIdColumn = 'playerid';
+    }
 
     require_once("classes/login.php");
     $login = new Login();
@@ -108,7 +113,7 @@
 
             if (isset($_GET['items'])) {
                 if (in_array($_GET['items'],$settings['item'])) {
-                    $sql = "UPDATE `users` SET `items` = " . $_GET['items'] . " WHERE `user_id` = '" . $_SESSION['user_id'] . "' ";
+                    $sql = "UPDATE `users` SET `items` = " . $_GET['items'] . " WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
                     $db_connection->query($sql);
                     $_SESSION['items'] = intval($_GET['items']);
                 }

views/firstTime.php

@@ -97,7 +97,7 @@ function decrypt($text, $salt)
     $settings['2factor'] = false;
     $settings['gravatar'] = false;
     $settings['force2factor'] = 'none';
-    $settings['playerColumn'] = 'playerid';
+    $settings['playerColumn'] = 'pid';
 
     $settings['steamAPI'] = '';
     $settings['vacTest'] = false;

views/life/editHouse.php

@@ -53,7 +53,7 @@
                         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);
                         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);
 
-                        $update = "UPDATE `players` SET coplevel = '$coplevel', mediclevel = '$mediclevel', " . $settings['donorFormat'] . "= 'donorlevel', adminlevel = '$adminlevel', cash = '$cash', bankacc = '$bankacc' WHERE `uid` = '$uID';";
+                        $update = "UPDATE `players` SET coplevel = '$coplevel', mediclevel = '$mediclevel', " . $settings['donorFormat'] . "= '$donorlevel', adminlevel = '$adminlevel', cash = '$cash', bankacc = '$bankacc' WHERE `uid` = '$uID';";
                         $result_of_query = $db_link->query($update);
                         message($lang['edited'] . ' ' . nameID($player->playerid, $db_link));
                     } else {

views/life/editPlayer.php

@@ -4,21 +4,21 @@
 
 if (isset($search)) {
     logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['vehicles'], 1);
-    $sql = "SELECT `id` FROM `houses` INNER JOIN `players` ON houses.pid=players.$playerIdColumn WHERE `pid` LIKE '$search' OR `pos` LIKE '$search' OR `inventory` LIKE '%$search%' OR `name` LIKE '%$search%';";
+    $sql = "SELECT h.`id` FROM `houses` h INNER JOIN `players` p ON houses.pid=players.$playerIdColumn WHERE h.`pid` LIKE '$search ' OR p.$playerIdColumn LIKE '$search ' OR h.`pos` LIKE '$search' OR p.`name` LIKE '%$search%';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) {
         $pageNum = $total_records;
     }
-    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.$playerIdColumn WHERE `pid` LIKE '$search ' OR `pos` LIKE '$search' OR `inventory` LIKE '%$search%' OR `name` LIKE '%$search%' $max;";
+    $sql = "SELECT h.id, h.pid, h.pos, p.name, h.owned FROM `houses` h INNER JOIN `players` p ON h.pid=p.$playerIdColumn WHERE h.`pid` LIKE '$search ' OR p.$playerIdColumn LIKE '$search ' OR h.`pos` LIKE '$search' OR p.`name` LIKE '%$search%' $max;";
 } else {
     $sql = "SELECT `id` FROM `houses`;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) {
         $pageNum = $total_records;
     }
-    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.$playerIdColumn $max;";
+    $sql = "SELECT h.id, h.pid, h.pos, p.name, h.owned FROM `houses` h INNER JOIN `players` p ON h.pid=p.$playerIdColumn $max;";
 }
 
 $result_of_query = $db_link->query($sql);