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

Add files via upload

pull/440/head
Kevin Siml 2017-04-06 11:03:16 +02:00 committed by GitHub
parent b1e3ff6b96
commit 8ccf12da9c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/psm/Module/User/Controller/ProfileController.class.php
View File

@ -35,7 +35,7 @@ class ProfileController extends AbstractController {
* Editable fields for the profile * Editable fields for the profile
* @var array $profile_fields * @var array $profile_fields
*/ */
protected $profile_fields = array('name', 'user_name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', '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) { function __construct(Database $db, \Twig_Environment $twig) {
parent::__construct($db, $twig); parent::__construct($db, $twig);
@ -68,6 +68,8 @@ class ProfileController extends AbstractController {
'label_pushsafer' => psm_get_lang('users', 'pushsafer'), 'label_pushsafer' => psm_get_lang('users', 'pushsafer'),
'label_pushsafer_description' => psm_get_lang('users', 'pushsafer_description'), 'label_pushsafer_description' => psm_get_lang('users', 'pushsafer_description'),
'label_pushsafer_key' => psm_get_lang('users', 'pushsafer_key'), '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_email' => psm_get_lang('users', 'email'),
'label_save' => psm_get_lang('system', 'save'), 'label_save' => psm_get_lang('system', 'save'),
'form_action' => psm_build_url(array( 'form_action' => psm_build_url(array(

9
src/psm/Module/User/Controller/UserController.class.php
View File

@ -95,7 +95,7 @@ class UserController extends AbstractController {
$users = $this->db->select( $users = $this->db->select(
PSM_DB_PREFIX.'users', PSM_DB_PREFIX.'users',
null, null,
array('user_id', 'user_name', 'level', 'name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'email'), array('user_id', 'user_name', 'level', 'name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'pushsafer_device', 'email'),
null, null,
array('name') array('name')
); );
@ -139,7 +139,7 @@ class UserController extends AbstractController {
*/ */
protected function executeEdit() { protected function executeEdit() {
$user_id = isset($_GET['id']) ? intval($_GET['id']) : 0; $user_id = isset($_GET['id']) ? intval($_GET['id']) : 0;
$fields_prefill = array('name', 'user_name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'email'); $fields_prefill = array('name', 'user_name', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'pushsafer_device', 'email');
if($user_id == 0) { if($user_id == 0) {
// insert mode // insert mode
@ -221,7 +221,7 @@ class UserController extends AbstractController {
} }
$user_id = (isset($_GET['id'])) ? intval($_GET['id']) : 0; $user_id = (isset($_GET['id'])) ? intval($_GET['id']) : 0;
$fields = array('name', 'user_name', 'password', 'password_repeat', 'level', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'email'); $fields = array('name', 'user_name', 'password', 'password_repeat', 'level', 'mobile', 'pushover_key', 'pushover_device', 'pushsafer_key', 'pushsafer_device', 'email');
$clean = array(); $clean = array();
foreach($fields as $field) { foreach($fields as $field) {
if(isset($_POST[$field])) { if(isset($_POST[$field])) {
@ -326,7 +326,8 @@ class UserController extends AbstractController {
'label_pushover_device_description' => psm_get_lang('users', 'pushover_device_description'), 'label_pushover_device_description' => psm_get_lang('users', 'pushover_device_description'),
'label_pushsafer' => psm_get_lang('users', 'pushsafer'), 'label_pushsafer' => psm_get_lang('users', 'pushsafer'),
'label_pushsafer_description' => psm_get_lang('users', 'pushsafer_description'), 'label_pushsafer_description' => psm_get_lang('users', 'pushsafer_description'),
'label_pushsafer_key' => psm_get_lang('users', 'pushsafer_key'), '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_email' => psm_get_lang('users', 'email'),
'label_servers' => psm_get_lang('menu', 'server'), 'label_servers' => psm_get_lang('menu', 'server'),
'label_action' => psm_get_lang('system', 'action'), 'label_action' => psm_get_lang('system', 'action'),