Răsfoiți Sursa

Change date/time inputs in user forms

Alan Lam 5 ani în urmă
părinte
comite
5be54ef89e
5 a modificat fișierele cu 78 adăugiri și 95 ștergeri
  1. 17 17
      controllers/register.php
  2. 23 20
      controllers/user_edit.php
  3. 7 0
      engine/user.php
  4. 12 30
      views/register.php
  5. 19 28
      views/user_edit_form.php

+ 17 - 17
controllers/register.php

@@ -17,38 +17,38 @@ $secondary_user_address->name = __("Secondary Residence");
 $secondary_user_address->country = DEFAULT_COUNTRY;
 
 try {
-	$submit = http::value("submit");
+	$submit = HTTP::value("submit");
 
 	if($submit) {
 		Core::validateCSRFToken($submit);
 
 		$form_exception = new FormException;
 
-		$password = http::value("password");
-		$password_confirm = http::value("password_confirm");
+		$password = HTTP::value("password");
+		$password_confirm = HTTP::value("password_confirm");
 
 		if($password != $password_confirm) $form_exception->addError(__("Passwords do not match."));
 
-		$user->email = http::value("email", "email");
+		$user->email = HTTP::value("email", "email");
 		$user->password = password_hash($password, PASSWORD_DEFAULT, ["cost" => 14]);
-		$user->title = http::value("title", "trim");
-		$user->first_name = http::value("first_name", "trim");
-		$user->last_name = http::value("last_name", "trim");
-		$user->gender = http::value("gender", "trim");
-		$user->date_of_birth = http::getDateFromFields("date_of_birth");
-		$user->phone = http::value("phone", "trim");
-		$user->terms_accepted = http::value("terms_accepted", "int") ? 1 : 0;
-		$user->newsletter_consent = http::value("newsletter_content", "int") ? 1 : 0;
+		$user->title = HTTP::value("title", "trim");
+		$user->first_name = HTTP::value("first_name", "trim");
+		$user->last_name = HTTP::value("last_name", "trim");
+		$user->gender = HTTP::value("gender", "trim");
+		$user->date_of_birth = HTTP::value("date_of_birth");
+		$user->phone = HTTP::value("phone", "trim");
+		$user->terms_accepted = HTTP::value("terms_accepted", "int") ? 1 : 0;
+		$user->newsletter_consent = HTTP::value("newsletter_content", "int") ? 1 : 0;
 		$user->dts_registered = gmdate("Y-m-d H:i:s");
 
-		$user_address->postal_code = http::value("postal_code");
-		$user_address->country = http::value("country");
+		$user_address->postal_code = HTTP::value("postal_code");
+		$user_address->country = HTTP::value("country");
 
-		$secondary_user_address->postal_code = http::value("secondary_postal_code");
-		$secondary_user_address->country = http::value("country");
+		$secondary_user_address->postal_code = HTTP::value("secondary_postal_code");
+		$secondary_user_address->country = HTTP::value("country");
 
 		// Referrer
-		$referrer_id = http::value("r", "int");
+		$referrer_id = HTTP::value("r", "int");
 		$referrer = User::get($referrer_id);
 		if($referrer) $user->referrer_id = $referrer_id;
 

+ 23 - 20
controllers/user_edit.php

@@ -1,4 +1,9 @@
-<?php
+<?php /** @noinspection PhpUnhandledExceptionInspection */
+
+/**
+ * @var int $id
+ * @var FormException $form_exception
+ */
 
 Core::addScript("public/js/app-user-edit.js");
 
@@ -18,7 +23,7 @@ Core::addBreadcrumb("/account/users", "Users");
 Core::addBreadcrumb("/account/users/$id", $user->getDisplayName());
 Core::addBreadcrumb("/account/users/$id/edit", $page_title);
 
-$submit = http::value("submit");
+$submit = HTTP::value("submit");
 if($submit) {
 	try {
 		Core::validateCSRFToken($submit);
@@ -26,30 +31,30 @@ if($submit) {
 		$form_exception = new FormException;
 
 		// Password
-		$password = http::value("password");
-		$password_confirm = http::value("password_confirm");
+		$password = HTTP::value("password");
+		$password_confirm = HTTP::value("password_confirm");
 
-		if($password != $password_confirm) $form_exception->addError("Passwords do not match.");
+		if($password !== $password_confirm) $form_exception->addError("Passwords do not match.");
 		if($password) {
 			$user->password = password_hash($password, PASSWORD_DEFAULT, ["cost" => 14]);
 		}
 
-		$user->level = http::value("level", "int");
-		$user->email = http::value("email", "email");
-		$user->title = http::value("title", "trim");
-		$user->first_name = http::value("first_name", "trim");
-		$user->last_name = http::value("last_name", "trim");
-		$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->gender = http::value("gender", "trim");
-		$user->activated = http::value("activated", "int");
-		$user->can_claim = http::value("can_claim", "int");
+		$user->level = HTTP::value("level", "int");
+		$user->email = HTTP::value("email", "email");
+		$user->title = HTTP::value("title", "trim");
+		$user->first_name = HTTP::value("first_name", "trim");
+		$user->last_name = HTTP::value("last_name", "trim");
+		$user->date_of_birth = HTTP::value("date_of_birth");
+		$user->reported = HTTP::value("reported", "int");
+		$user->reported_comment = HTTP::value("reported_comment", "trim");
+		$user->phone = HTTP::value("phone", "trim");
+		$user->gender = HTTP::value("gender", "trim");
+		$user->activated = HTTP::value("activated", "int");
+		$user->can_claim = HTTP::value("can_claim", "int");
 
 		$user_customer_link->delete();
 
-		$customer_id = http::value("customer_id", "int");
+		$customer_id = HTTP::value("customer_id", "int");
 		if($customer_id) {
 			$customer = Customer::get($customer_id);
 			if(!$customer) $form_exception->addError("Customer is invalid.");
@@ -89,5 +94,3 @@ if($submit) {
 View::includeOnce("header", compact("page_title"));
 View::include("user_edit_form", compact("user", "customers", "user_customer_link"));
 View::includeOnce("footer");
-
-?>

+ 7 - 0
engine/user.php

@@ -1,5 +1,7 @@
 <?php
 
+use Carbon\CarbonImmutable;
+
 /**
  * Class User
  *
@@ -761,4 +763,9 @@ class User extends Model {
 		return $this->level >= self::LEVEL_CUSTOMER;
 	}
 
+	public function getDateTimeDateOfBirth(): ?CarbonImmutable {
+		if(!$this->date_of_birth) return null;
+		return CarbonImmutable::parse($this->date_of_birth);
+	}
+
 }

+ 12 - 30
views/register.php

@@ -1,11 +1,12 @@
 <?php /** @noinspection PhpVoidFunctionResultUsedInspection */
 
-$newsletter_consent_checked = ($user->newsletter_consent) ? "checked" : "";
+/**
+ * @var User $user
+ * @var UserAddress $user_address
+ * @var UserAddress $secondary_user_address
+ */
 
-$year = $month = $day = null;
-if($user->date_of_birth) {
-	list($year, $month, $day) = explode("-", $user->date_of_birth);
-}
+$newsletter_consent_checked = ($user->newsletter_consent) ? "checked" : "";
 
 ?>
 <div class="container mt-3 py-4">
@@ -31,7 +32,7 @@ if($user->date_of_birth) {
 							<option value=""><?=htmlspecialchars(__("Select title"))?></option>
 							<?php
 							foreach(User::titles() as $value => $display) {
-								$selected = ($user->title == $value) ? "selected" : "";
+								$selected = ($user->title === $value) ? "selected" : "";
 								?>
 								<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
 								<?php
@@ -58,8 +59,9 @@ if($user->date_of_birth) {
 						<select class="form-control w-auto" name="gender" id="gender" required>
 							<option value=""><?=htmlspecialchars(__("Select gender"))?></option>
 							<?php
-							foreach(User::genders() as $value => $display) {
-								$selected = ($user->gender == $value) ? "selected" : "";
+							foreach(User::genders() as $gender_name => $display) {
+								$value = $gender_name[0];
+								$selected = ($user->gender === $value) ? "selected" : "";
 								?>
 								<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
 								<?php
@@ -100,29 +102,9 @@ if($user->date_of_birth) {
 					</div>
 				</div>
 				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"><?=htmlspecialchars(__("Date of Birth"))?></label>
+					<label class="col-sm-4 col-form-label" for="date-of-birth"><?=htmlspecialchars(__("Date of Birth"))?></label>
 					<div class="col-sm">
-                        <label for="date-of-birth-day" class="sr-only"><?=htmlspecialchars(__("Day"))?></label>
-						<select class="form-control w-auto d-inline-block" name="date_of_birth_day" id="date-of-birth-day" required>
-							<option value=""><?=htmlspecialchars(__("Day"))?></option>
-							<?php
-							Form::renderDayOptions($day);
-							?>
-						</select>
-                        <label for="date-of-birth-month" class="sr-only"><?=htmlspecialchars(__("Month"))?></label>
-						<select class="form-control w-auto d-inline-block" name="date_of_birth_month" id="date-of-birth-month" required>
-							<option value=""><?=htmlspecialchars(__("Month"))?></option>
-							<?php
-							Form::renderMonthOptions($month);
-							?>
-						</select>
-                        <label for="date-of-birth-year" class="sr-only"><?=htmlspecialchars(__("Year"))?></label>
-						<select class="form-control w-auto d-inline-block" name="date_of_birth_year" id="date-of-birth-year" required>
-							<option value=""><?=htmlspecialchars(__("Year"))?></option>
-							<?php
-							Form::renderYearOptionsDescending(null, null, $year);
-							?>
-						</select>
+						<input class="form-control" type="date" name="date_of_birth" id="date-of-birth" value="<?=htmlspecialchars($user->date_of_birth)?>" required />
 					</div>
 				</div>
 				<div class="row mb-1">

+ 19 - 28
views/user_edit_form.php

@@ -1,6 +1,14 @@
-<?php
+<?php /** @noinspection PhpUnhandledExceptionInspection */
+
+/**
+ * @var Customer[] $customers
+ * @var User $user
+ * @var UserCustomer $user_customer_link
+ */
+
+$dt_dob = $user->getDateTimeDateOfBirth();
+$date_dob = $dt_dob ? $dt_dob->format("Y-m-d") : "";
 
-$date_of_birth_parts = explode("-", $user->date_of_birth);
 $activated_checked = ($user->activated) ? "checked" : "";
 $can_claim_checked = ($user->can_claim) ? "checked" : "";
 
@@ -25,7 +33,7 @@ var userId = <?=$user->id?>;
 						<?php
 						foreach(User::LEVELS as $value => $display) {
 							if($value > Core::$user->level) continue;
-							$selected = ($user->level == $value) ? "selected" : "";
+							$selected = ((int) $user->level === $value) ? "selected" : "";
 							?>
 							<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
 							<?php
@@ -46,7 +54,7 @@ var userId = <?=$user->id?>;
 								<option value="">Unassigned</option>
 								<?php
 								foreach($customers as $customer) {
-									$selected = ($customer->id == $user_customer_link->customer_id) ? "selected" : "";
+									$selected = (int) $customer->id === (int) $user_customer_link->customer_id ? "selected" : "";
 									?>
 									<option value="<?=htmlspecialchars($customer->id)?>" <?=$selected?>><?=htmlspecialchars($customer->name)?></option>
 									<?php
@@ -76,7 +84,7 @@ var userId = <?=$user->id?>;
 							<option value="">Select title</option>
 							<?php
 							foreach(User::titles() as $value => $display) {
-								$selected = ($user->title == $value) ? "selected" : "";
+								$selected = $user->title === $value ? "selected" : "";
 								?>
 								<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
 								<?php
@@ -104,8 +112,8 @@ var userId = <?=$user->id?>;
 							<option value="">Select gender</option>
 							<?php
 							foreach(User::genders() as $value => $display) {
-								$value = substr($value, 0, 1);
-								$selected = ($user->gender == $value) ? "selected" : "";
+								$value = $value[0];
+								$selected = ($user->gender === $value) ? "selected" : "";
 								?>
 								<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
 								<?php
@@ -140,26 +148,9 @@ var userId = <?=$user->id?>;
 					</div>
 				</div>
 				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="date-of-birth">Date of Birth</label>
+					<label class="col-sm-4 col-form-label" for="date-of-birth">Date of Birth</label>
 					<div class="col-sm">
-						<select class="form-control w-auto d-inline-block" name="date_of_birth_day" id="date-of-birth-day">
-							<option value="">Day</option>
-							<?php
-							Form::renderDayOptions($date_of_birth_parts[2]);
-							?>
-						</select>
-						<select class="form-control w-auto d-inline-block" name="date_of_birth_month" id="date-of-birth-month">
-							<option value="">Month</option>
-							<?php
-							Form::renderMonthOptions($date_of_birth_parts[1]);
-							?>
-						</select>
-						<select class="form-control w-auto d-inline-block" name="date_of_birth_year" id="date-of-birth-year">
-							<option value="">Year</option>
-							<?php
-							Form::renderYearOptionsDescending(null, null, $date_of_birth_parts[0]);
-							?>
-						</select>
+						<input class="form-control" type="date" name="date_of_birth" id="date-of-birth" value="<?=$date_dob?>" />
 					</div>
 				</div>
 				<div class="row mb-1">
@@ -168,7 +159,7 @@ var userId = <?=$user->id?>;
 						<select class="form-control" name="reported" id="reported">
 						<?php
 						foreach(Form::BOOLEAN_OPTIONS as $value => $display) {
-							$selected = ($user->reported == $value) ? "selected" : "";
+							$selected = ((int) $user->reported === $value) ? "selected" : "";
 							?>
 							<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
 							<?php
@@ -190,7 +181,7 @@ var userId = <?=$user->id?>;
 						<select class="form-control" name="can_claim" id="can-claim">
 						<?php
 						foreach(Form::BOOLEAN_OPTIONS as $value => $display) {
-							$selected = ($user->can_claim == $value) ? "selected" : "";
+							$selected = (int) $user->can_claim === $value ? "selected" : "";
 							?>
 							<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
 							<?php