Ekokumppanit/ystavakylaecard
1
0
Fork 0
mirror of https://github.com/Ekokumppanit/ystavakylaecard.git synced 2026-02-07 18:44:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved passwordhash() from yllapito controller to user model, where it belongs

Browse Source
This commit is contained in:
Ismo Vuorinen
2013-07-17 13:57:41 +03:00
parent 78cb7b2eee
commit d3377cf62e
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/controllers/yllapito.php
View File

@@ -175,7 +175,7 @@ class Yllapito extends CI_Controller
$pass = $this->input->post('password');
// Hash the password
$pass = $this->passwordhash($pass);
$pass = $this->users->passwordhash($pass);
$test = array(
'username' => $user,
@@ -227,16 +227,6 @@ class Yllapito extends CI_Controller
public function makePassword($password = null)
{
echo $this->passwordhash($password);
}
private function passwordhash($password = null)
{
return hash(
'ripemd160',
$password . $this->config->item('encryption_key')
);
echo $this->users->passwordhash($password);
}
}

8
application/models/user_model.php
View File

@@ -12,6 +12,14 @@ class User_model extends MY_Model
parent::__construct();
}
public function passwordhash($password = null)
{
return hash(
'ripemd160',
$password . $this->config->item('encryption_key')
);
}
protected function timestamps($ecard)
{
$ecard['created_at'] = $ecard['updated_at'] = date('Y-m-d H:i:s');