From 6b7bd911f71bce210ae784dec0d372e08891cf56 Mon Sep 17 00:00:00 2001 From: haitem Date: Sat, 17 Oct 2020 18:03:55 +0200 Subject: [PATCH] Add email to create user, in setting edit user permission and emailmanager file --- app/controllers/settingController.php | 12 +++++++++--- app/models/managers/EmailManager.php | 11 +++++++++++ app/models/managers/UserManager.php | 16 ++++++++++++---- app/views/templates/setting.phtml | 14 ++++++++++++++ lang/cs.php | 4 ++++ lang/en.php | 4 ++++ lang/nl.php | 1 + lang/pl.php | 1 + 8 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 app/models/managers/EmailManager.php diff --git a/app/controllers/settingController.php b/app/controllers/settingController.php index 068aecb..b5652ec 100644 --- a/app/controllers/settingController.php +++ b/app/controllers/settingController.php @@ -1,16 +1,18 @@ changePassword($oldPassword, $newPassword, $newPassword2); header('Location: ' . BASEURL . 'logout'); die(); } else if (isset($_POST['submitCreateUser']) && $_POST['submitCreateUser'] != "") { $userName = $_POST['userName']; $password = $_POST['userPassword']; - UserManager::createUser($userName, $password); + $email = $_POST['userEmail']; + $userManager->createUser($userName, $password, $email); header('Location: ' . BASEURL . 'setting'); die(); } else if (isset($_POST['submitEnableOta']) && $_POST['submitEnableOta'] != "") { @@ -20,9 +22,13 @@ if (isset($_POST) && !empty($_POST)){ $ga = new PHPGangsta_GoogleAuthenticator(); $checkResult = $ga->verifyCode($otaSecret, $otaCode, 2); // 2 = 2*30sec clock tolerance if ($checkResult) { - UserManager::setOta($otaCode, $otaSecret); + $userManager->setOta($otaCode, $otaSecret); } header('Location: ' . BASEURL . 'setting'); die(); + } else if (isset ($_POST['userPermission']) && !empty ($_POST['userID'])) { + $userManager->setUserDataAdmin("permission", $_POST['userPermission'], $_POST['userID']); + header('Location: ' . BASEURL . 'setting'); + die(); } } diff --git a/app/models/managers/EmailManager.php b/app/models/managers/EmailManager.php new file mode 100644 index 0000000..7c263b7 --- /dev/null +++ b/app/models/managers/EmailManager.php @@ -0,0 +1,11 @@ + $userName, 'password' => self::getHashPassword($password), + 'email' => $email, ]; return Db::add ('users', $user); } catch(PDOException $error) { diff --git a/app/views/templates/setting.phtml b/app/views/templates/setting.phtml index e1b2b11..753f111 100644 --- a/app/views/templates/setting.phtml +++ b/app/views/templates/setting.phtml @@ -117,6 +117,7 @@ echo('t_avatar');?> echo('t_userName');?> echo('t_ota');?> + echo('t_permission');?> echo('t_action');?> @@ -126,6 +127,15 @@ ' : ''); ?> + +
+ + +
+ @@ -143,6 +153,10 @@
echo('l_password') ?>:
+
+
echo('l_email') ?>:
+ +
diff --git a/lang/cs.php b/lang/cs.php index 9b77403..b69b44c 100644 --- a/lang/cs.php +++ b/lang/cs.php @@ -57,6 +57,7 @@ return $lang = [ 'l_notificationStatus' => 'Notification status', 'l_userName' => 'Uživatelské jméno', 'l_password' => 'Heslo', + 'l_email' => 'Email', 'l_oldPassword' => 'Staré Heslo', 'l_newPassword' => 'Nové Heslo', 'l_uploadFirmware' => 'Nahrát Firmware', @@ -79,6 +80,9 @@ return $lang = [ 't_networkSetting' => 'Nastavení Sítě', 't_deviceVersion' => 'Nastavení Verze', 't_ota' => 'OTA', + 't_permission' => 'Oprávnění', + 't_permission_user' => 'Uživatel', + 't_permission_admin' => 'Administrátor', 't_listUsers' => 'Seznam Uživatelů', 't_avatar' => 'Avatar', 't_listRooms' => 'Seznam Místností', diff --git a/lang/en.php b/lang/en.php index 657838b..e39d0b2 100644 --- a/lang/en.php +++ b/lang/en.php @@ -57,6 +57,7 @@ return $lang = [ 'l_notificationStatus' => 'Notification status', 'l_userName' => 'Username', 'l_password' => 'Password', + 'l_email' => 'Email', 'l_oldPassword' => 'Old Password', 'l_newPassword' => 'New Password', 'l_uploadFirmware' => 'Upload Firmware', @@ -79,6 +80,9 @@ return $lang = [ 't_networkSetting' => 'Network Setting', 't_deviceVersion' => 'Version Setting', 't_ota' => 'OTA', + 't_permission' => 'Permission', + 't_permission_user' => 'User', + 't_permission_admin' => 'Admin', 't_listUsers' => 'User List', 't_avatar' => 'Avatar', 't_listRooms' => 'Room List', diff --git a/lang/nl.php b/lang/nl.php index 9195bc2..76500cd 100644 --- a/lang/nl.php +++ b/lang/nl.php @@ -52,6 +52,7 @@ return $lang = [ 'l_sleepTime' => 'Apparaat slaaptijd', 'l_atHome' => 'Thuis', 'l_nameAt' => 'Naam', + 'l_email' => 'Email', 'l_lastSeen' => 'Laatst gezien', 'l_notificationStatus' => 'Notificatie status', diff --git a/lang/pl.php b/lang/pl.php index b1423af..d2c88d3 100644 --- a/lang/pl.php +++ b/lang/pl.php @@ -56,6 +56,7 @@ return $lang = [ 'l_notificationStatus' => 'Stan powiadomienia', 'l_userName' => 'Username', //newOne 'l_password' => 'Password', //newOne + 'l_email' => 'Email', 'l_oldPassword' => 'Old Password', //newOne 'l_newPassword' => 'New Password', //newOne