diff --git a/classes/models/BaseUserModel.php b/classes/models/BaseUserModel.php new file mode 100644 index 0000000..01c292e --- /dev/null +++ b/classes/models/BaseUserModel.php @@ -0,0 +1,31 @@ +id = $id; + } + + public function get_id() : int { + return $this->id; + } + + /** + * Check wether this object is valid or not + * + * @return bool TRUE if this object is valid / FALSE else + */ + public function isValid() : bool { + return $this->id > 0; + } +} \ No newline at end of file diff --git a/classes/models/GeneralSettings.php b/classes/models/GeneralSettings.php index c9ff17e..6a1bea9 100644 --- a/classes/models/GeneralSettings.php +++ b/classes/models/GeneralSettings.php @@ -5,10 +5,9 @@ * @author Pierre HUBERT */ -class GeneralSettings { +class GeneralSettings extends BaseUserModel { //Private fields - private $id; private $email; private $firstName; private $lastName; @@ -21,15 +20,6 @@ class GeneralSettings { private $virtualDirectory; private $personnalWebsite; - //Set and get user ID - public function set_id(int $id){ - $this->id = $id; - } - - public function get_id() : int { - return $this->id; - } - //Set and get the email address of the user public function set_email(string $email){ $this->email = $email; @@ -150,13 +140,4 @@ class GeneralSettings { public function get_personnalWebsite() : string { return $this->personnalWebsite != null ? $this->personnalWebsite : "null"; } - - /** - * Check wether is object is valid or not - * - * @return bool TRUE if this object is valid / FALSE else - */ - public function isValid() : bool { - return $this->id > 0; - } } \ No newline at end of file diff --git a/classes/models/SecuritySettings.php b/classes/models/SecuritySettings.php index 44e64f1..1a14551 100644 --- a/classes/models/SecuritySettings.php +++ b/classes/models/SecuritySettings.php @@ -5,7 +5,7 @@ * @author Pierre HUBERT */ -class SecuritySettings { +class SecuritySettings extends BaseUserModel { //Private fields private $security_question_1; @@ -54,7 +54,7 @@ class SecuritySettings { public function get_security_question_2() : string { return $this->security_question_2 != null ? $this->security_question_2 : "null"; } - + //Set and get second security answer public function set_security_answer_2(string $security_answer_2){ diff --git a/classes/models/User.php b/classes/models/User.php index 99460c8..a7a2d2e 100644 --- a/classes/models/User.php +++ b/classes/models/User.php @@ -5,10 +5,12 @@ * @author Pierre HUBERT */ -class User { +//This model requires the BaseUserModel to be loaded +require_once __DIR__."/BaseUserModel.php"; + +class User extends BaseUserModel { //Private fields - private $id; private $firstName; private $lastName; private $publicPage; @@ -16,26 +18,6 @@ class User { private $virtualDirectory; private $accountImageURL; - /** - * Public constructor of this object - */ - public function __construct(){ - - //Set the user ID to 0 by default (invalid user) - $this->set_id(0); - - } - - //Set and get user ID - public function set_id(int $id){ - $this->id = $id; - } - - public function get_id() : int { - return $this->id; - } - - //Set and get the first name of the user public function set_firstName(string $firstName){ $this->firstName = $firstName; @@ -96,13 +78,4 @@ class User { public function get_accountImageURL() : string { return $this->accountImageURL; } - - /** - * Check wether is object is valid or not - * - * @return bool TRUE if this object is valid / FALSE else - */ - public function isValid() : bool { - return $this->id > 0; - } } \ No newline at end of file