github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Add files via upload

pull/441/head
Kevin Siml 2017-04-07 10:06:43 +02:00 committed by GitHub
parent 10f8f2f318
commit e96099e7a9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/psm/Module/User/Controller/ProfileController.php
View File

@ -35,7 +35,7 @@ class ProfileController extends AbstractController {
* Editable fields for the profile
* @var array $profile_fields
*/
protected $profile_fields = array('name', 'user_name', 'mobile', 'pushover_key', 'pushover_device', 'email');
protected $profile_fields = array('name', 'user_name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'pushsafer_device', 'email');
function __construct(Database $db, \Twig_Environment $twig) {
parent::__construct($db, $twig);
@ -66,6 +66,11 @@ class ProfileController extends AbstractController {
'label_pushover_key' => psm_get_lang('users', 'pushover_key'),
'label_pushover_device' => psm_get_lang('users', 'pushover_device'),
'label_pushover_device_description' => psm_get_lang('users', 'pushover_device_description'),
'label_pushsafer' => psm_get_lang('users', 'pushsafer'),
'label_pushsafer_description' => psm_get_lang('users', 'pushsafer_description'),
'label_pushsafer_key' => psm_get_lang('users', 'pushsafer_key'),
'label_pushsafer_device' => psm_get_lang('users', 'pushsafer_device'),
'label_pushsafer_device_description' => psm_get_lang('users', 'pushsafer_device_description'),
'label_email' => psm_get_lang('users', 'email'),
'label_save' => psm_get_lang('system', 'save'),
'form_action' => psm_build_url(array(

10
src/psm/Module/User/Controller/UserController.php
View File

@ -89,7 +89,7 @@ class UserController extends AbstractController {
$users = $this->db->select(
PSM_DB_PREFIX.'users',
null,
array('user_id', 'user_name', 'level', 'name', 'mobile', 'pushover_key', 'pushover_device', 'email'),
array('user_id', 'user_name', 'level', 'name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'pushsafer_device', 'email'),
null,
array('name')
);
@ -133,7 +133,7 @@ class UserController extends AbstractController {
*/
protected function executeEdit() {
$user_id = isset($_GET['id']) ? intval($_GET['id']) : 0;
$fields_prefill = array('name', 'user_name', 'mobile', 'pushover_key', 'pushover_device', 'email');
$fields_prefill = array('name', 'user_name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'pushsafer_device', 'email');
if($user_id == 0) {
// insert mode
@ -215,7 +215,7 @@ class UserController extends AbstractController {
}
$user_id = (isset($_GET['id'])) ? intval($_GET['id']) : 0;
$fields = array('name', 'user_name', 'password', 'password_repeat', 'level', 'mobile', 'pushover_key', 'pushover_device', 'email');
$fields = array('name', 'user_name', 'password', 'password_repeat', 'level', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'pushsafer_device', 'email');
$clean = array();
foreach($fields as $field) {
if(isset($_POST[$field])) {
@ -333,6 +333,10 @@ class UserController extends AbstractController {
'label_pushover_key' => psm_get_lang('users', 'pushover_key'),
'label_pushover_device' => psm_get_lang('users', 'pushover_device'),
'label_pushover_device_description' => psm_get_lang('users', 'pushover_device_description'),
'label_pushsafer' => psm_get_lang('users', 'pushsafer'),
'label_pushsafer_description' => psm_get_lang('users', 'pushsafer_description'),
'label_pushsafer_key' => psm_get_lang('users', 'pushsafer_key'),
'label_pushsafer_device' => psm_get_lang('users', 'pushsafer_device'),
'label_email' => psm_get_lang('users', 'email'),
'label_servers' => psm_get_lang('menu', 'server'),
'label_action' => psm_get_lang('system', 'action'),