GitHub-Mirror/urlgrey-hsmm-pi
0
0
Fork 0
mirror of https://github.com/urlgrey/hsmm-pi synced 2025-10-06 00:12:53 +02:00
Code Issues Releases Wiki Activity

Fix deprecations.

Browse Source
This commit is contained in:
Clayton Smith
2016-04-02 13:41:26 -04:00
parent 59c82bb5e8
commit da9112cefd
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/var/www/hsmm-pi/Controller/LocationSettingsController.php
View File

@@ -11,7 +11,7 @@ class LocationSettingsController extends AppController {
}
$this->set('location_source', $location['LocationSetting']['location_source']);
if ($this->request->isPost() || $this->request->isPut()) {
if ($this->request->is('post') || $this->request->is('put')) {
if ($this->LocationSetting->save($this->request->data)) {
$latest_location = $this->get_location();
$network_setting = $this->get_network_settings();
@@ -50,4 +50,4 @@ class LocationSettingsController extends AppController {
}
?>
?>

3
src/var/www/hsmm-pi/Controller/NetworkSettingsController.php
View File

@@ -10,7 +10,7 @@ class NetworkSettingsController extends AppController {
throw new NotFoundException(__('Invalid setting'));
}
if ($this->request->isPost() || $this->request->isPut()) {
if ($this->request->is('post') || $this->request->is('put')) {
if ($this->NetworkSetting->save($this->request->data)) {
$latest_network_setting = $this->get_network_settings();
$network_services = $this->get_network_services();
@@ -151,4 +151,3 @@ no-dhcp-interface=" . $network_setting['NetworkSetting']['wifi_adapter_name'];
}
?>

4
src/var/www/hsmm-pi/Controller/UsersController.php
View File

@@ -12,7 +12,7 @@ class UsersController extends AppController {
if ($this->Auth->login()) {
$this->Session->setFlash(__('Login successful, carry on'), 'default', array('class' => 'alert alert-success'));
$this->redirect($this->Auth->redirect());
$this->redirect($this->Auth->redirectUrl());
} else {
$this->Session->setFlash(__('Invalid username or password, try again'), 'default', array('class' => 'alert alert-error'));
}
@@ -31,7 +31,7 @@ class UsersController extends AppController {
if ($admin_user == null) {
$this->Session->setFlash(__('Unable to find user account, this should never happen'), 'default', array('class' => 'alert alert-error'));
} else if (strcmp($admin_user['User']['password'], AuthComponent::password($this->request->data['User']['current_password'])) != 0) {
} else if (strcmp($admin_user['User']['password'], Security::hash($this->request->data['User']['current_password'], null, true)) != 0) {
$this->Session->setFlash(__('The current password was incorrect'), 'default', array('class' => 'alert alert-error'));
} else if (strcmp($this->request->data['User']['password'], $this->request->data['User']['password_confirmation']) != 0) {
$this->Session->setFlash(__('New passwords did not match'), 'default', array('class' => 'alert alert-error'));

2
src/var/www/hsmm-pi/Model/User.php
View File

@@ -11,7 +11,7 @@ class User extends AppModel {
public function beforeSave($options = array()) {
if (isset($this->data[$this->alias]['password'])) {
$this->data[$this->alias]['password'] = AuthComponent::password($this->data[$this->alias]['password']);
$this->data[$this->alias]['password'] = Security::hash($this->data[$this->alias]['password'], null, true);
}
return true;
}