Merge remote-tracking branch 'upstream/master'

1 files changed, 30 insertions, 3 deletions

diff --git a/www/profile.php b/www/profile.php
index ccdb7a8..63f4da8 100644
--- a/www/profile.php
+++ b/www/profile.php
@@ -23,12 +23,16 @@ require_once 'www-header.php';
 
 /* Service creation: only useful services are created */
 // No specific services
+$tplVars['loadjs'] = true;
 
 /* Managing all possible inputs */
+isset($_POST['submittedPK']) ? define('POST_SUBMITTEDPK', $_POST['submittedPK']): define('POST_SUBMITTEDPK', '');
 isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
 isset($_POST['pPass']) ? define('POST_PASS', $_POST['pPass']): define('POST_PASS', '');
 isset($_POST['pPassConf']) ? define('POST_PASSCONF', $_POST['pPassConf']): define('POST_PASSCONF', '');
 isset($_POST['pName']) ? define('POST_NAME', $_POST['pName']): define('POST_NAME', '');
+isset($_POST['pPrivateKey']) ? define('POST_PRIVATEKEY', $_POST['pPrivateKey']): define('POST_PRIVATEKEY', '');
+isset($_POST['pEnablePrivateKey']) ? define('POST_ENABLEPRIVATEKEY', $_POST['pEnablePrivateKey']): define('POST_ENABLEPRIVATEKEY', '');
 isset($_POST['pMail']) ? define('POST_MAIL', $_POST['pMail']): define('POST_MAIL', '');
 isset($_POST['pPage']) ? define('POST_PAGE', $_POST['pPage']): define('POST_PAGE', '');
 isset($_POST['pDesc']) ? define('POST_DESC', $_POST['pDesc']): define('POST_DESC', '');
@@ -61,10 +65,19 @@ if ($user) {
 	exit();
 }
 
+$tplVars['privateKeyIsEnabled'] = '';
 if ($userservice->isLoggedOn() && $user == $currentUser->getUsername()) {
-	$title = T_('My Profile');
+    $title = T_('My Profile');
+    $tplVars['privateKey'] = $currentUser->getPrivateKey(true);
+
+    if ($userservice->isPrivateKeyValid($currentUser->getPrivateKey())) {
+        $tplVars['privateKeyIsEnabled'] = 'checked="checked"';
+    } else {
+        $tplVars['privateKeyIsEnabled'] = '';
+    }
 } else {
-	$title = T_('Profile') .': '. $user;
+    $title = T_('Profile') .': '. $user;
+    $tplVars['privateKey'] = '';
 }
 $tplVars['pagetitle'] = $title;
 $tplVars['subtitle'] = $title;
@@ -72,11 +85,19 @@ $tplVars['subtitle'] = $title;
 $tplVars['user'] = $user;
 $tplVars['userid'] = $userid;
 
+/* Update Private Key */
+if (POST_SUBMITTEDPK!='' && $currentUser->getId() == $userid) {
+    $userinfo = $userservice->getObjectUserByUsername($user);
+    $tplVars['privateKey'] = $userservice->getNewPrivateKey();
+}
+
 if (POST_SUBMITTED!='' && $currentUser->getId() == $userid) {
 	$error = false;
 	$detPass = trim(POST_PASS);
 	$detPassConf = trim(POST_PASSCONF);
 	$detName = trim(POST_NAME);
+	$detPrivateKey = trim(POST_PRIVATEKEY);
+	$detEnablePrivateKey = trim(POST_ENABLEPRIVATEKEY);
 	$detMail = trim(POST_MAIL);
 	$detPage = trim(POST_PAGE);
 	$detDesc = filter(POST_DESC);
@@ -102,13 +123,19 @@ if (POST_SUBMITTED!='' && $currentUser->getId() == $userid) {
 		$tplVars['error'] = T_('E-mail address is not valid.');
 	}
 	if (!$error) {
-		if (!$userservice->updateUser($userid, $detPass, $detName, $detMail, $detPage, $detDesc)) {
+		if (!$userservice->updateUser($userid, $detPass, $detName, $detMail, $detPage, $detDesc, $detPrivateKey, $detEnablePrivateKey)) {
 			$tplVars['error'] = T_('An error occurred while saving your changes.');
 		} else {
 			$tplVars['msg'] = T_('Changes saved.');
 		}
 	}
 	$userinfo = $userservice->getObjectUserByUsername($user);
+	$tplVars['privateKey'] = $userinfo->getPrivateKey(true);
+	if ($userservice->isPrivateKeyValid($userinfo->getPrivateKey())) {
+		$tplVars['privateKeyIsEnabled'] = 'checked="checked"';
+	} else {
+		$tplVars['privateKeyIsEnabled'] = '';
+	}
 }
 
 if (!$userservice->isLoggedOn() || $currentUser->getId() != $userid) {