1
0
Эх сурвалжийг харах

Add support to mark users as reported

Alan Lam 8 жил өмнө
parent
commit
2d2da1e94e

+ 2 - 0
controllers/project_ajax.php

@@ -206,6 +206,8 @@ if($submit) {
 						"levelText" => $user->getLevelText(),
 						"levelText" => $user->getLevelText(),
 						"levelClass" => $user->getLevelClass(),
 						"levelClass" => $user->getLevelClass(),
 						"termsAccepted" => boolval($user->terms_accepted),
 						"termsAccepted" => boolval($user->terms_accepted),
+						"reported" => (int) $user->reported,
+						"reportedComment" => $user->reported_comment
 					];
 					];
 
 
 				}
 				}

+ 2 - 0
controllers/user_edit.php

@@ -35,6 +35,8 @@ if($submit) {
 		$user->first_name = http::value("first_name", "trim");
 		$user->first_name = http::value("first_name", "trim");
 		$user->last_name = http::value("last_name", "trim");
 		$user->last_name = http::value("last_name", "trim");
 		$user->date_of_birth = http::getDateFromFields("date_of_birth");
 		$user->date_of_birth = http::getDateFromFields("date_of_birth");
+		$user->reported = http::value("reported", "int");
+		$user->reported_comment = http::value("reported_comment", "trim");
 		$user->phone = http::value("phone", "trim");
 		$user->phone = http::value("phone", "trim");
 		$user->gender = http::value("gender", "trim");
 		$user->gender = http::value("gender", "trim");
 		$user->activated = http::value("activated", "int");
 		$user->activated = http::value("activated", "int");

+ 5 - 0
engine/form.php

@@ -2,6 +2,11 @@
 
 
 class Form {
 class Form {
 
 
+	const BOOLEAN_OPTIONS = [
+		0 => "No",
+		1 => "Yes",
+	];
+
 	public static function checked($value) {
 	public static function checked($value) {
 		return !empty($value) ? "checked" : "";
 		return !empty($value) ? "checked" : "";
 	}
 	}

+ 1 - 1
engine/user.php

@@ -4,7 +4,7 @@ class User extends Model {
 
 
 	protected static $table = "user";
 	protected static $table = "user";
 	protected static $id_field = "id";
 	protected static $id_field = "id";
-	protected static $fillable_fields = ["email", "old_id", "referrer_id", "password", "activated", "level", "score", "title", "first_name", "last_name", "gender", "date_of_birth", "phone", "verify_token", "reset_token", "terms_accepted", "preferred_payment_method", "bank_name", "bank_sort_code", "bank_account_number", "paypal_email", "dts_registered", "dts_last_seen", "dts_verified", "dts_deleted", "verifier_id", "verifier_notes"];
+	protected static $fillable_fields = ["email", "old_id", "referrer_id", "password", "activated", "level", "score", "title", "first_name", "last_name", "gender", "date_of_birth", "reported", "reported_comment", "phone", "verify_token", "reset_token", "terms_accepted", "preferred_payment_method", "bank_name", "bank_sort_code", "bank_account_number", "paypal_email", "dts_registered", "dts_last_seen", "dts_verified", "dts_deleted", "verifier_id", "verifier_notes"];
 
 
 	// Constants
 	// Constants
 
 

+ 6 - 0
public/js/app-project.js

@@ -377,6 +377,10 @@ function initialiseTesters() {
 				td.append("<span class=\"badge badge-danger\" title=\"Terms and Conditions not accepted\">T&amp;C</span> ");
 				td.append("<span class=\"badge badge-danger\" title=\"Terms and Conditions not accepted\">T&amp;C</span> ");
 			}
 			}
 
 
+			if(tester.reported) {
+				td.append("<span class=\"badge badge-danger\" data-toggle=\"tooltip\" data-title=\"" + tester.reportedComment + "\">Reported</span> ");
+			}
+
 			td.append("<span class=\"badge badge-" + tester.levelClass + "\">" + tester.levelText + "</span>");
 			td.append("<span class=\"badge badge-" + tester.levelClass + "\">" + tester.levelText + "</span>");
 			td.append("<br />");
 			td.append("<br />");
 			td.append($("<small>").text(tester.phone));
 			td.append($("<small>").text(tester.phone));
@@ -393,6 +397,8 @@ function initialiseTesters() {
 
 
 		$("#testers-table").append(tbody);
 		$("#testers-table").append(tbody);
 
 
+		initialiseTooltips();
+
 	});
 	});
 }
 }
 
 

+ 4 - 1
public/js/app.js

@@ -1,5 +1,4 @@
 $(function() {
 $(function() {
-	$('[data-toggle="tooltip"]').tooltip();
 
 
 	$("#page-jump-button").click(function(event) {
 	$("#page-jump-button").click(function(event) {
 		let urlTemplate = $(this).data("url-template");
 		let urlTemplate = $(this).data("url-template");
@@ -50,6 +49,10 @@ $(function() {
 
 
 var maps = [];
 var maps = [];
 
 
+function initialiseTooltips() {
+	$('[data-toggle="tooltip"]').tooltip();
+}
+
 function initialiseMaps() {
 function initialiseMaps() {
 
 
 	$("div[data-maps]").each(function() {
 	$("div[data-maps]").each(function() {

+ 5 - 0
views/user.php

@@ -17,8 +17,13 @@ $details = [
 	"Score" => number_format($user->score),
 	"Score" => number_format($user->score),
 	"Registered" => $user->dts_registered,
 	"Registered" => $user->dts_registered,
 	"Last Seen" => $user->dts_last_seen,
 	"Last Seen" => $user->dts_last_seen,
+	"Reported" => $user->reported ? "<span class=\"text-danger\"><i class=\"fas fa-exclamation-circle\"></i> Yes</span>" : "No"
 ];
 ];
 
 
+if($user->reported_comment) {
+	$details["Reported Notes"] = htmlspecialchars($user->reported_comment);
+}
+
 if($referrer) {
 if($referrer) {
 	$details["Referrer"] = "<a href=\"/account/users/$referrer->id\">" . htmlspecialchars($referrer->getDisplayName()) . "</a>";
 	$details["Referrer"] = "<a href=\"/account/users/$referrer->id\">" . htmlspecialchars($referrer->getDisplayName()) . "</a>";
 }
 }

+ 21 - 1
views/user_edit_form.php

@@ -136,12 +136,32 @@ var userId = <?=$user->id?>;
 						</select>
 						</select>
 					</div>
 					</div>
 				</div>
 				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="reported">Reported</label>
+					<div class="col-sm">
+						<select class="form-control" name="reported" id="reported" />
+						<?php
+						foreach(Form::BOOLEAN_OPTIONS as $value => $display) {
+							$selected = ($user->reported == $value) ? "selected" : "";
+							?>
+							<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
+							<?php
+						}
+						?>
+						</select>
+					</div>
+				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="reported-comment">Reported Notes</label>
+					<div class="col-sm">
+						<textarea class="form-control" name="reported_comment" id="reported-comment" placeholder="Enter reported notes" rows="4"><?=htmlspecialchars($user->reported_comment)?></textarea>
+					</div>
+				</div>
 			</div>
 			</div>
 			<div class="col-lg-6 mb-3">
 			<div class="col-lg-6 mb-3">
 
 
 				<h3>Addresses</h3>
 				<h3>Addresses</h3>
 
 
-
 				<?php
 				<?php
 				$addresses = $user->getAddresses();
 				$addresses = $user->getAddresses();
 				if(empty($addresses)) {
 				if(empty($addresses)) {

+ 10 - 1
views/users.php

@@ -160,7 +160,16 @@ $query["sort"] = "SORT";
 						<?=$user->id?>
 						<?=$user->id?>
 					</td>
 					</td>
 					<td class="align-middle">
 					<td class="align-middle">
-						<a href="/account/users/<?=$user->id?>"><?=htmlspecialchars($user->getDisplayName())?></a><br />
+						<a href="/account/users/<?=$user->id?>"><?=htmlspecialchars($user->getDisplayName())?></a>
+						<?php
+						if($user->reported) {
+							$comment = $user->reported_comment ?: "Reported";
+							?>
+							<span class="text-danger" data-toggle="tooltip" data-title="<?=htmlspecialchars($comment)?>"><i class="fas fa-exclamation-circle"></i></span>
+							<?php
+						}
+						?>
+						<br />
 						<small><?=htmlspecialchars($user->email)?> <?=$activated?></small>
 						<small><?=htmlspecialchars($user->email)?> <?=$activated?></small>
 					</td>
 					</td>
 					<td class="text-center align-middle">
 					<td class="text-center align-middle">