From 6e19db1f757dc743583c3b0a0da8d3e1c12cd347 Mon Sep 17 00:00:00 2001 From: Connor Date: Sun, 23 Apr 2017 14:45:14 +0100 Subject: [PATCH 1/8] Update notes.php --- notes.php | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/notes.php b/notes.php index 436f0f7..5d8c962 100755 --- a/notes.php +++ b/notes.php @@ -65,11 +65,11 @@ - + - - + + @@ -81,16 +81,16 @@ echo ''; echo ''; echo ''; - echo '"; + echo '"; echo '"; echo ''; - echo "'; + echo "'; echo ''; echo ''; } if (isset($_POST['update'])) { - $sql = "SELECT * FROM `players` WHERE `uid` = $_POST[hidden]"; + $sql = "SELECT * FROM `players` WHERE `playerid` = $_POST[hidden]"; $result = mysqli_query($dbcon, $sql); $player = $result->fetch_object(); @@ -101,8 +101,43 @@ logIt($user, $message, $dbcon); $note = $_POST['note']; $note = '"'.$note.'"'; - $UpdateN = "INSERT INTO notes (uid, staff_name, name, alias, note_text, warning) VALUES ('$_POST[hidden]', '$user', '$player->name', '$player->aliases', '$note','$_POST[warn]')"; - mysqli_query($dbcon, $UpdateN); + + $UpdateN = 'INSERT INTO notes (uid, staff_name, name, alias, note_text, warning)' + . ' VALUES ( ?, ? , ? , ? , ? , ? )'; + + if( $sth = mysqli_prepare($dbcon,$UpdateN) ) { + mysqli_stmt_bind_param($sth,'ssssss' + ,$_POST['hidden'] + ,$user + ,$player->name + ,$player->aliases + ,$_POST['note'] + ,$_POST['warn'] + ); + if( mysqli_stmt_execute($sth) ) { + // statement execution successful + } else { + printf("Error: %s\n",mysqli_stmt_error($sth)); + } + } else { + printf("Error: %s\n",mysqli_error($dbcon)); + } + + $UpdateN2 = 'UPDATE players SET warning = warning + ? WHERE playerid = ? '; + + if( $sth2 = mysqli_prepare($dbcon,$UpdateN2) ) { + mysqli_stmt_bind_param($sth2,'ss' + ,$_POST['warn'] + ,$_POST['hidden'] + ); + if( mysqli_stmt_execute($sth2) ) { + // statement execution successful + } else { + printf("1Error: %s\n",mysqli_stmt_error($sth2)); + } + } else { + printf("2Error: %s\n",mysqli_error($dbcon)); + } } } From 957a11e35675e45bbb2ed65e69f76a79b51ecad7 Mon Sep 17 00:00:00 2001 From: Connor Date: Sun, 23 Apr 2017 14:47:13 +0100 Subject: [PATCH 2/8] Update editPlayer.php --- editPlayer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/editPlayer.php b/editPlayer.php index 5904b32..7cc5fec 100644 --- a/editPlayer.php +++ b/editPlayer.php @@ -102,6 +102,7 @@ echo '

UID: '.$player->uid.'

'; echo '

Player ID: '.$pid.'

'; echo '

GUID: '.$guidPlayer.'

'; +echo '

Warning Points: '.$player->warning.'

'; echo '

Bank: $'.$player->bankacc.'

'; echo '

Cash: $'.$player->cash.'

'; echo '

Cop Level: '.$player->coplevel.'

'; From 9e36c44da48385223ef1d6f1d22fd89034bb4d75 Mon Sep 17 00:00:00 2001 From: Connor Date: Sun, 30 Apr 2017 22:52:10 +0100 Subject: [PATCH 3/8] Add files via upload Adds a case logging & log page, Uses a modified reimbursement_log table which uses the statement found here: https://pastebin.com/vBbV11qD --- staffcase.php | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 staffcase.php diff --git a/staffcase.php b/staffcase.php new file mode 100644 index 0000000..3fa33bf --- /dev/null +++ b/staffcase.php @@ -0,0 +1,144 @@ +"; + header('Location: lvlError.php'); +} +include 'header/header.php'; +?> + + + +
+

Staff Cases

+

Staff Case Logs of the panel, allows you to see staff cases.

+ +
+
Player IDPlayer ID Name AliasNote TypeNew NotesWarning PointsCase Notes Update
'.$row['uid'].' '.$row['name'].' '.$row['aliases'].' '." '." '." '." ".' ".'
+ + + + + + + + + + + + +'; + echo ''; + + echo ''; + echo ''; + +echo '
Your NamePerson ReportingPerson Being ReportedPlayer UIDReported ForOutComeAdd Log
'.""; + echo ''.""; + echo ''.""; + echo ''.""; + echo ''.""; + echo ''.""; + echo ''."'; + + echo '
'; + +if (isset($_POST['update'])) { + $staffn = $_POST['staffn']; + $personr = $_POST['personr']; + $personbr = $_POST['personbr']; + $uid = $_POST['uid']; + $report = $_POST['report']; + $outcome = $_POST['outcome']; + +} +$messageIdent = md5($_POST['update'] . $_POST['staffn'] . $_POST['personr'] . $_POST['personbr'] . $_POST['uid'] . $_POST['report'] . $_POST['outcome']); + +$sessionMessageIdent = isset($_SESSION['messageIdent'])?$_SESSION['messageIdent']:''; + + if($messageIdent!=$sessionMessageIdent){//if its different: + //save the session var: + $_SESSION['messageIdent'] = $messageIdent; + //and... + $UpdateQ = "INSERT INTO staff_logs (staffn,personr,personbr,playerid,report,outcome,staff_name) VALUES ('$staffn','$personr','$personbr','$uid','$report','$outcome','$user');"; + mysqli_query($dbcon, $UpdateQ); + } else { + //you've sent this already! + } +?> + +

+ + + +
+ + + + + + + + + + + + + + + + +'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; +} + +echo '
Case IdStaff NamePerson ReportingPerson Being ReportedPlayerIDReported ForOutcomeAdminTime Stamp
'.$row['case_id'].''.$row['staffn'].' '.$row['personr'].' '.$row['personbr'].' '.$row['playerid'].' '.$row['report'].' '.$row['outcome'].' '.$row['staff_name'].' '.$row['timestamp'].'
'; +?> + + + + + + + + + + + + + + + + + + From 82c4617de34f33e3d51f72a85434370af2bbc206 Mon Sep 17 00:00:00 2001 From: Connor Date: Wed, 3 May 2017 22:22:26 +0100 Subject: [PATCH 4/8] Update notes.php Fix for warning pointsnot being added and error 'column can not be null' has been fixed. --- notes.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/notes.php b/notes.php index 5d8c962..5aee7b9 100755 --- a/notes.php +++ b/notes.php @@ -33,8 +33,8 @@ ?>
-

Notes Menu

-

Notes Menu of the panel, allows you to set notes on players.

+

Warning Menu

+

Warning Menu of the panel, allows you to set points and notes on players.

@@ -65,9 +65,9 @@ - + - + @@ -80,8 +80,8 @@ echo ''; echo ''; echo ''; - echo ''; - echo '"; + echo ''; + echo '"; echo '"; echo ''; echo "'; @@ -97,10 +97,12 @@ $pid = playerID($player); if ($_POST['note'] != $player->note_text) { - $message = 'Admin '.$user.' has added the note ('.$_POST['note'].') to '.$player->name.'('.$pid.')'; + $message = 'Admin '.$user.' has added '.$_POST['warning'].' warning points and the note ('.$_POST['note'].') to '.$player->name.'('.$pid.')'; logIt($user, $message, $dbcon); $note = $_POST['note']; $note = '"'.$note.'"'; + $warning = $_POST['warning']; + $warning = '"'.$warning.'"'; $UpdateN = 'INSERT INTO notes (uid, staff_name, name, alias, note_text, warning)' . ' VALUES ( ?, ? , ? , ? , ? , ? )'; @@ -112,7 +114,7 @@ ,$player->name ,$player->aliases ,$_POST['note'] - ,$_POST['warn'] + ,$_POST['warning'] ); if( mysqli_stmt_execute($sth) ) { // statement execution successful @@ -127,7 +129,7 @@ if( $sth2 = mysqli_prepare($dbcon,$UpdateN2) ) { mysqli_stmt_bind_param($sth2,'ss' - ,$_POST['warn'] + ,$_POST['warning'] ,$_POST['hidden'] ); if( mysqli_stmt_execute($sth2) ) { From 0e42ebbd9a1cf983dcac95f0e30e9bd57c0835b3 Mon Sep 17 00:00:00 2001 From: Connor Date: Tue, 9 May 2017 18:09:20 +0100 Subject: [PATCH 5/8] Update notes.php Allows the use of uid instead of playerid. Since all dbs use uid to link a player, there is no need to use playerid unless a new framework uses it. --- notes.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/notes.php b/notes.php index 5aee7b9..81c405e 100755 --- a/notes.php +++ b/notes.php @@ -84,20 +84,20 @@ echo '"; echo '"; echo ''; - echo "'; + echo "'; echo ''; echo ''; } if (isset($_POST['update'])) { - $sql = "SELECT * FROM `players` WHERE `playerid` = $_POST[hidden]"; + $sql = "SELECT * FROM `players` WHERE `uid` = $_POST[hidden]"; $result = mysqli_query($dbcon, $sql); $player = $result->fetch_object(); $pid = playerID($player); if ($_POST['note'] != $player->note_text) { - $message = 'Admin '.$user.' has added '.$_POST['warning'].' warning points and the note ('.$_POST['note'].') to '.$player->name.'('.$pid.')'; + $message = 'Admin '.$user.' has added '.$_POST['warning'].' warning points and the note ('.$_POST['note'].') to '.$player->name.'('.$_POST['hidden'].')'; logIt($user, $message, $dbcon); $note = $_POST['note']; $note = '"'.$note.'"'; @@ -125,7 +125,7 @@ printf("Error: %s\n",mysqli_error($dbcon)); } - $UpdateN2 = 'UPDATE players SET warning = warning + ? WHERE playerid = ? '; + $UpdateN2 = 'UPDATE players SET warning = warning + ? WHERE uid = ? '; if( $sth2 = mysqli_prepare($dbcon,$UpdateN2) ) { mysqli_stmt_bind_param($sth2,'ss' From a92db5cf83513629108ab3049b1d1f0a2d511d12 Mon Sep 17 00:00:00 2001 From: Connor Date: Wed, 17 May 2017 19:55:04 +0100 Subject: [PATCH 6/8] Update notes.php Removal of playerid being used (Still there on the concat search) and added so that the current warning points can be viewed. --- notes.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/notes.php b/notes.php index 81c405e..86aa067 100755 --- a/notes.php +++ b/notes.php @@ -18,10 +18,10 @@ if (isset($_POST['search'])) { $valuetosearch = $_POST['SearchValue']; - $sqlget = "SELECT * FROM players WHERE CONCAT (`name`,`playerid`,`uid`, `aliases`) LIKE '%".$valuetosearch."%'"; + $sqlget = "SELECT * FROM players WHERE CONCAT (`name`,`playerid`,`warning`,`uid`,`aliases`) LIKE '%".$valuetosearch."%'"; $search_result = filterTable($dbcon, $sqlget); if ($search_result == '') { - $sqlget = "SELECT * FROM players WHERE CONCAT (`name`,`pid`,`uid`, `aliases`) LIKE '%".$valuetosearch."%'"; + $sqlget = "SELECT * FROM players WHERE CONCAT (`name`,`pid`,`warning`,`uid`,`aliases`) LIKE '%".$valuetosearch."%'"; $search_result = filterTable($dbcon, $sqlget); } } else { @@ -34,7 +34,7 @@

Warning Menu

-

Warning Menu of the panel, allows you to set points and notes on players.

+

Warning Menu of the panel, allows you to set points and notes on players.
If warning points are 30+ please go to SMT to get them banned from the server.

@@ -67,7 +67,7 @@
- + @@ -77,10 +77,11 @@ '; + echo ''; echo ''; echo ''; - echo ''; + echo ''; echo '"; echo '"; echo ''; From 086e244d51022303fb74aaad4fc87fd9e2d1eb0a Mon Sep 17 00:00:00 2001 From: Connor Date: Wed, 17 May 2017 19:56:09 +0100 Subject: [PATCH 7/8] Update notes.php --- notes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notes.php b/notes.php index 86aa067..d72b908 100755 --- a/notes.php +++ b/notes.php @@ -33,7 +33,7 @@ ?>
-

Warning Menu

+

Warning Panel

Warning Menu of the panel, allows you to set points and notes on players.
If warning points are 30+ please go to SMT to get them banned from the server.

From f91761c3a61cc280fbcf4bf56ece245163ee4c5f Mon Sep 17 00:00:00 2001 From: Connor Date: Fri, 9 Jun 2017 00:46:27 +0100 Subject: [PATCH 8/8] Warning system & Staff Notes Creates the warning column in the players table and adds a new table to use the for the staff notes. It uses the notes table already for the warning . --- verifyCheck.php | 124 ++++++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 46 deletions(-) diff --git a/verifyCheck.php b/verifyCheck.php index df90656..f5db271 100644 --- a/verifyCheck.php +++ b/verifyCheck.php @@ -65,6 +65,13 @@ } else { $maxCop = 7; } + + if ($_POST['maxWarning'] != '') { + $maxWarning = $_POST['maxWarning']; + $maxWarning = (int) $maxWarning; + } else { + $maxWarning = 30; + } if ($_POST['maxMedic'] != '') { $maxMedic = $_POST['maxMedic']; @@ -155,6 +162,8 @@ function Rconconnect(){ global ".'$'.'maxCop; '.'$'."maxCop = $maxCop; +global ".'$'.'maxWarning; +'.'$'."MaxWarning = $Warning; global ".'$'.'maxMedic; '.'$'."maxMedic = $maxMedic; global ".'$'.'maxAdmin; @@ -196,65 +205,62 @@ function Rconconnect(){ $sqldata5 = mysqli_query($dbconnect, $sqlDel5); $sqlmake = ' - CREATE TABLE IF NOT EXISTS `log` ( - `logid` int(11) NOT NULL AUTO_INCREMENT, - `date_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `user` varchar(64) DEFAULT NULL, - `action` varchar(255) DEFAULT NULL, - `level` int(11) NOT NULL, - PRIMARY KEY (`logid`), - UNIQUE KEY `logid` (`logid`), - KEY `logid_2` (`logid`) - ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1; + CREATE TABLE IF NOT EXISTS `log` ( + `logid` int(11) NOT NULL AUTO_INCREMENT, + `date_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `user` varchar(64) DEFAULT NULL, + `action` varchar(255) DEFAULT NULL, + `level` int(11) NOT NULL, + PRIMARY KEY (`logid`), + UNIQUE KEY `logid` (`logid`), + KEY `logid_2` (`logid`) + ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1; '; $sqldata = mysqli_query($dbconnect, $sqlmake) or die('Connection could not be established - LOG'); $sqlmake2 = ' - - CREATE TABLE IF NOT EXISTS `users` ( - `ID` mediumint(9) NOT NULL AUTO_INCREMENT, - `username` varchar(60) NOT NULL, - `password` varchar(80) NOT NULL, - `permissions` text NOT NULL, - PRIMARY KEY (`ID`) - ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;'; + CREATE TABLE IF NOT EXISTS `users` ( + `ID` mediumint(9) NOT NULL AUTO_INCREMENT, + `username` varchar(60) NOT NULL, + `password` varchar(80) NOT NULL, + `permissions` text NOT NULL, + PRIMARY KEY (`ID`) + ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;'; $sqldata1 = mysqli_query($dbconnect, $sqlmake2) or die('Connection could not be established - USERS!'); $sqlmake3 = " - - CREATE TABLE IF NOT EXISTS `notes` ( - `note_id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'auto incrementing note_id of each user, unique index', - `uid` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', - `staff_name` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', - `name` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', - `alias` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', - `note_text` VARCHAR(255) NOT NULL, - `warning` ENUM('1','2','3','4') NOT NULL, - `note_updated` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`note_id`), - UNIQUE INDEX `note_id` (`note_id`) - ) COLLATE='latin1_swedish_ci' ENGINE=InnoDB AUTO_INCREMENT=6; + CREATE TABLE IF NOT EXISTS `notes` ( + `note_id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'auto incrementing note_id of each user, unique index', + `uid` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', + `staff_name` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', + `name` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', + `alias` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', + `note_text` VARCHAR(255) NOT NULL, + `warning` ENUM('1','2','3','4') NOT NULL DEFAULT '0', + `note_updated` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`note_id`), + UNIQUE INDEX `note_id` (`note_id`) + ) COLLATE='latin1_swedish_ci' ENGINE=InnoDB AUTO_INCREMENT=6; "; $sqldata100 = mysqli_query($dbconnect, $sqlmake3) or die('Connection could not be established - NOTES!'); $sqlmake4 = " - - CREATE TABLE IF NOT EXISTS `reimbursement_log` ( - `reimbursement_id` INT(11) NOT NULL AUTO_INCREMENT, - `playerid` VARCHAR(50) NOT NULL, - `comp` INT(100) NOT NULL DEFAULT '0', - `reason` VARCHAR(255) NOT NULL, - `staff_name` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', - `timestamp` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`reimbursement_id`), - UNIQUE INDEX `reimbursement_id` (`reimbursement_id`) - ) - COLLATE='latin1_swedish_ci' - ENGINE=InnoDB - AUTO_INCREMENT=1; + CREATE TABLE IF NOT EXISTS `reimbursement_log` ( + `reimbursement_id` INT(11) NOT NULL AUTO_INCREMENT, + `playerid` VARCHAR(50) NOT NULL, + `comp` INT(100) NOT NULL DEFAULT '0', + `reason` VARCHAR(255) NOT NULL, + `staff_name` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci', + `timestamp` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`reimbursement_id`), + UNIQUE INDEX `reimbursement_id` (`reimbursement_id`) + ) + COLLATE='latin1_swedish_ci' + ENGINE=InnoDB + AUTO_INCREMENT=1; "; $sqldata9 = mysqli_query($dbconnect, $sqlmake4) or die('Connection could not be established - REIM!'); @@ -281,7 +287,33 @@ function Rconconnect(){ UNIQUE KEY `accessID` (`accessID`), KEY `accessID_1` (`accessID`) ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1; -'; + '; + $sqldata11 = mysqli_query($dbconnect, $sqlmake6) or die('Connection could not be established - Staff Logs!'); + + $sqlmake7 = ' + CREATE TABLE `staff_logs` ( + `case_id` int(11) NOT NULL AUTO_INCREMENT, + `staffn` varchar(50) NOT NULL, + `personr` varchar(50) NOT NULL, + `personbr` varchar(50) NOT NULL, + `playerid` varchar(64) NOT NULL, + `report` varchar(100) NOT NULL, + `outcome` varchar(255) NOT NULL, + `staff_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`case_id`), + UNIQUE KEY `case_id` (`case_id`) + ) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=latin1; + + '; + + $sqldata12 = mysqli_query($dbconnect, $sqlmake7) or die('Connection could not be established - Player Warning!'); + + $sqlmake8 = ("ALTER TABLE `players` ADD `warning` enum('0','1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30') NOT NULL DEFAULT '0' AFTER `last_seen`"); + '; + +'; + $sqlMakeAccess = mysqli_query($dbconnect, $sqlmake6) or die('Connection could not be established - Access!'); $sqldeluser = "DELETE FROM users WHERE username='AdminPanel';";
Player IDUID NameAliasPlayer ID Warning Points Case Notes Update
'.$row['uid'].' '.$row['name'].' '.$row['aliases'].' '." '.$row['playerid'].' '." '." '." ".' '." '." '." ".' ".'
UID NamePlayer IDCurrent Points Warning Points Case Notes Update
'.$row['uid'].' '.$row['name'].' '.$row['playerid'].' '.$row['warning'].' '." '." '."