From a05d36d5f62c908accf5bb61924bf152194341ae Mon Sep 17 00:00:00 2001 From: TimZ99 Date: Thu, 5 Jul 2018 16:40:58 +0200 Subject: [PATCH] Corrected typos & removed unused code Removed unused data from query. Fixed a few typos. --- src/includes/functions.inc.php | 3 +-- src/psm/Module/User/Controller/UserController.php | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php index 65671cc5..f99cbbd6 100644 --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -76,10 +76,9 @@ function psm_load_lang($lang) { // 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'; - 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); unset($sm_lang); - // load translation is the selected language is not English (en_US) if($lang != "en_US"){ $lang_file = PSM_PATH_LANG . $lang . '.lang.php'; diff --git a/src/psm/Module/User/Controller/UserController.php b/src/psm/Module/User/Controller/UserController.php index 79748ad0..c44a9887 100644 --- a/src/psm/Module/User/Controller/UserController.php +++ b/src/psm/Module/User/Controller/UserController.php @@ -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', 'telegram_id', 'email'), + array('user_id', 'user_name', 'level', 'name', 'mobile', 'email'), null, array('name') ); @@ -319,7 +319,7 @@ class UserController extends AbstractController { protected function getLabels() { return array( - 'label_users' => psm_get_lang('menu', 'users'), + 'label_users' => psm_get_lang('menu', 'user'), 'label_user' => psm_get_lang('users', 'user'), 'label_name' => psm_get_lang('users', '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_telegram' => psm_get_lang('users', 'telegram'), 'label_telegram_description' => psm_get_lang('users', 'telegram_description'), - 'label_telegram_id' => psm_get_lang('users', 'telegram_id'), - 'label_telegram_id_description' => psm_get_lang('users', 'telegram_id_description'), + 'label_telegram_id' => psm_get_lang('users', 'telegram_chat_id'), + 'label_telegram_id_description' => psm_get_lang('users', 'telegram_chat_id_description'), 'label_email' => psm_get_lang('users', 'email'), 'label_servers' => psm_get_lang('menu', 'server'), 'label_action' => psm_get_lang('system', 'action'),