Skip to content

Update handling users passwords #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajuszczyk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update handling users passwords #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4c8426
Update .gitignore
ajuszczyk Apr 29, 2026
bb91b04
Update User.php
ajuszczyk Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@ vendor/
.env
/src/mod/**
node_modules/
src/js/*.svg
src/js/feather.js
src/js/*.min.js.map
src/js/icons/*.svg
src/js/*.js.map
src/js/*.min.js
src/js/icons.json
131 changes: 66 additions & 65 deletions src/includes/classes/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* User
*
Expand Down Expand Up @@ -42,15 +43,15 @@ class User
public DAO $DAO;

/**
* CONSTRUCTOR for the class function
* @param string $username
* @param string $passsword
*/
* CONSTRUCTOR for the class function
* @param string $username
* @param string $passsword
*/
public function __construct($username = null, $password = null)
{
$this->username = $username;
$this->source_id = '';
$this->password = password_hash($password, PASSWORD_DEFAULT);
$this->password = password_needs_rehash($password, PASSWORD_DEFAULT) ? password_hash($password, PASSWORD_DEFAULT) : $password;
$this->id = null;
$this->type = null;
$this->id_number = null;
Expand All @@ -69,12 +70,12 @@ public function __construct($username = null, $password = null)
*/

/**
* Load the object from the given data
*
* @param array $user_info assoc-array of User info
*
* @return boolean did the load succeed
*/
* Load the object from the given data
*
* @param array $user_info assoc-array of User info
*
* @return boolean did the load succeed
*/
public function load_from_row($user_info)
{
if (is_array($user_info)) {
Expand All @@ -100,10 +101,10 @@ public function load_from_row($user_info)
// /->load_from_row()

/**
* Is this user admin?
*
* @return boolean user is admin
*/
* Is this user admin?
*
* @return boolean user is admin
*/
public function is_admin()
{
return $this->admin == 1;
Expand All @@ -112,10 +113,10 @@ public function is_admin()
// /->is_admin()

/**
* Is this user staff?
*
* @return boolean user is staff
*/
* Is this user staff?
*
* @return boolean user is staff
*/
public function is_staff()
{
return ($this->type == APP__USER_TYPE_ADMIN) || ($this->type == APP__USER_TYPE_TUTOR);
Expand Down Expand Up @@ -175,28 +176,28 @@ public function update_source_id($source_id)
public function save_user()
{
$this->DAO
->getConnection()
->createQueryBuilder()
->update(APP__DB_TABLE_PREFIX . 'user')
->set('forename', '?')
->set('lastname', '?')
->set('email', '?')
->set('username', '?')
->set('source_id', '?')
->set('password', '?')
->set('id_number', '?')
->set('department_id', '?')
->where('user_id = ?')
->setParameter(0, $this->forename)
->setParameter(1, $this->lastname)
->setParameter(2, $this->email)
->setParameter(3, $this->username)
->setParameter(4, $this->source_id)
->setParameter(5, $this->password)
->setParameter(6, $this->id_number)
->setParameter(7, $this->department_id)
->setParameter(8, $this->id, ParameterType::INTEGER)
->execute();
->getConnection()
->createQueryBuilder()
->update(APP__DB_TABLE_PREFIX . 'user')
->set('forename', '?')
->set('lastname', '?')
->set('email', '?')
->set('username', '?')
->set('source_id', '?')
->set('password', '?')
->set('id_number', '?')
->set('department_id', '?')
->where('user_id = ?')
->setParameter(0, $this->forename)
->setParameter(1, $this->lastname)
->setParameter(2, $this->email)
->setParameter(3, $this->username)
->setParameter(4, $this->source_id)
->setParameter(5, $this->password)
->setParameter(6, $this->id_number)
->setParameter(7, $this->department_id)
->setParameter(8, $this->id, ParameterType::INTEGER)
->execute();

return true;
}
Expand All @@ -216,30 +217,30 @@ public function set_dao_object(DAO $DB)
public function add_user()
{
$this->DAO
->getConnection()
->createQueryBuilder()
->insert(APP__DB_TABLE_PREFIX . 'user')
->values([
'forename' => '?',
'lastname' => '?',
'email' => '?',
'username' => '?',
'source_id' => '?',
'password' => '?',
'id_number' => '?',
'department_id' => '?',
'admin' => '?',
])
->setParameter(0, $this->forename)
->setParameter(1, $this->lastname)
->setParameter(2, $this->email)
->setParameter(3, $this->username)
->setParameter(4, $this->source_id)
->setParameter(5, $this->password)
->setParameter(6, $this->id_number)
->setParameter(7, $this->department_id)
->setParameter(8, $this->admin, ParameterType::INTEGER)
->execute();
->getConnection()
->createQueryBuilder()
->insert(APP__DB_TABLE_PREFIX . 'user')
->values([
'forename' => '?',
'lastname' => '?',
'email' => '?',
'username' => '?',
'source_id' => '?',
'password' => '?',
'id_number' => '?',
'department_id' => '?',
'admin' => '?',
])
->setParameter(0, $this->forename)
->setParameter(1, $this->lastname)
->setParameter(2, $this->email)
->setParameter(3, $this->username)
->setParameter(4, $this->source_id)
->setParameter(5, $this->password)
->setParameter(6, $this->id_number)
->setParameter(7, $this->department_id)
->setParameter(8, $this->admin, ParameterType::INTEGER)
->execute();

return $this->DAO->getConnection()->lastInsertId('user_id');
}
Expand Down