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

Corrected typos & removed unused code 

Removed unused data from query.
Fixed a few typos.
pull/612/merge
TimZ99 2018-07-05 16:40:58 +02:00
parent 3023c83226
commit a05d36d5f6
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/includes/functions.inc.php
View File

@ -76,10 +76,9 @@ function psm_load_lang($lang) {
// this will also fill in every part that is not translated in other translation files // this will also fill in every part that is not translated in other translation files
$default_lang_file = PSM_PATH_LANG . 'en_US.lang.php'; $default_lang_file = PSM_PATH_LANG . 'en_US.lang.php';
file_exists($default_lang_file) ? require $default_lang_file : trigger_error("English translation needs to be intalled at all time!", E_USER_ERROR); file_exists($default_lang_file) ? require $default_lang_file : trigger_error("English translation needs to be installed at all time!", E_USER_ERROR);
isset($sm_lang) ? $GLOBALS['sm_lang_default'] = $sm_lang : trigger_error("\$sm_lang not found in English translation!", E_USER_ERROR); isset($sm_lang) ? $GLOBALS['sm_lang_default'] = $sm_lang : trigger_error("\$sm_lang not found in English translation!", E_USER_ERROR);
unset($sm_lang); unset($sm_lang);
// load translation is the selected language is not English (en_US) // load translation is the selected language is not English (en_US)
if($lang != "en_US"){ if($lang != "en_US"){
$lang_file = PSM_PATH_LANG . $lang . '.lang.php'; $lang_file = PSM_PATH_LANG . $lang . '.lang.php';

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

@ -89,7 +89,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', 'telegram_id', 'email'), array('user_id', 'user_name', 'level', 'name', 'mobile', 'email'),
null, null,
array('name') array('name')
); );
@ -319,7 +319,7 @@ class UserController extends AbstractController {
protected function getLabels() { protected function getLabels() {
return array( return array(
'label_users' => psm_get_lang('menu', 'users'), 'label_users' => psm_get_lang('menu', 'user'),
'label_user' => psm_get_lang('users', 'user'), 'label_user' => psm_get_lang('users', 'user'),
'label_name' => psm_get_lang('users', 'name'), 'label_name' => psm_get_lang('users', 'name'),
'label_user_name' => psm_get_lang('users', 'user_name'), 'label_user_name' => psm_get_lang('users', 'user_name'),
@ -335,8 +335,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_telegram' => psm_get_lang('users', 'telegram'), 'label_telegram' => psm_get_lang('users', 'telegram'),
'label_telegram_description' => psm_get_lang('users', 'telegram_description'), 'label_telegram_description' => psm_get_lang('users', 'telegram_description'),
'label_telegram_id' => psm_get_lang('users', 'telegram_id'), 'label_telegram_id' => psm_get_lang('users', 'telegram_chat_id'),
'label_telegram_id_description' => psm_get_lang('users', 'telegram_id_description'), 'label_telegram_id_description' => psm_get_lang('users', 'telegram_chat_id_description'),
'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'),