[Fusionforge-commits] FusionForge branch Branch_5_3 updated. v5.3-rc4-517-g7cae201

Roland Mas lolando at libremir.placard.fr.eu.org
Mon Jan 11 18:03:48 CET 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  7cae201adeaabdbcb3591baa14cd4137436737c3 (commit)
      from  b0dbfdf7d77aa53fa3801a38424d414b7aaa6bfe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7cae201adeaabdbcb3591baa14cd4137436737c3

commit 7cae201adeaabdbcb3591baa14cd4137436737c3
Author: Roland Mas <lolando at debian.org>
Date:   Mon Jan 11 18:03:07 2016 +0100

    Revert "Removed links to edit email address, password, and SSH keys from user account maintenance page"
    
    This reverts commit b0dbfdf7d77aa53fa3801a38424d414b7aaa6bfe.

diff --git a/src/www/account/index.php b/src/www/account/index.php
index aa67abb..38dd0d9 100644
--- a/src/www/account/index.php
+++ b/src/www/account/index.php
@@ -148,6 +148,7 @@ echo $HTML->boxTop(_('Account options'));
 <tr class="top">
 <td><?php echo _('Login Name')._(':'); ?> </td>
 <td><?php print $u->getUnixName(); ?>
+<br /><a href="change_pw.php"><?php echo _('Change Password'); ?></a>
 </td>
 </tr>
 
@@ -196,6 +197,7 @@ echo $HTML->boxTop(_('Account options'));
 <tr>
 <td><?php echo _('Email Address') . _(': '); ?> </td>
 <td><?php print $u->getEmail(); ?>
+<br /><a href="change_email.php">[<?php echo _('Change Email Address'); ?>]</a>
 </td>
 </tr>
 
@@ -291,6 +293,45 @@ plugin_hook("userisactivecheckbox", $hookParams);
 
 echo $HTML->boxBottom();
 
+// ############################### Shell Account
+
+if (forge_get_config('use_shell')) {
+	echo $HTML->boxTop(_('Shell Account Information')."");
+	if ($u->getUnixStatus() == 'A') {
+		print ' 
+	<br />'._('Shell box').': <strong>'.forge_get_config('shell_host').'</strong>
+	<br />'._('SSH Shared Authorized Keys').': <strong>';
+		global $HTML;
+		$sshKeysArray = $u->getAuthorizedKeys();
+		if (is_array($sshKeysArray) && count($sshKeysArray)) {
+			$tabletop = array(_('Name'), _('Algorithm'), _('Fingerprint'), _('Uploaded'), _('Ready ?'));
+			$classth = array('', '', '', '', '');
+			echo $HTML->listTableTop($tabletop, false, 'sortable_sshkeys_listlinks', 'sortable', $classth);
+			foreach($sshKeysArray as $sshKey) {
+				echo '<tr>';
+				echo '<td>'.$sshKey['name'].'</td>';
+				echo '<td>'.$sshKey['algorithm'].'</td>';
+				echo '<td>'.$sshKey['fingerprint'].'</td>';
+				echo '<td>'.date(_('Y-m-d H:i'), $sshKey['upload']).'</td>';
+				if ($sshKey['deploy']) {
+					$image = html_image('docman/validate.png', 22, 22, array('alt'=>_('ssh key is deployed.'), 'class'=>'tabtitle', 'title'=>_('ssh key is deployed.')));
+				} else {
+					$image = html_image('waiting.png', 22, 22, array('alt'=>_('ssh key is not deployed yet.'), 'class'=>'tabtitle', 'title'=>_('ssh key is not deployed yet.')));
+				}
+				echo '<td>'.$image.'</td>';
+				echo '</tr>';
+			}
+			echo $HTML->listTableBottom();
+		} else {
+			print '0';
+		}
+		print '</strong>';
+		print '<br />' . util_make_link("account/editsshkeys.php",_('Edit Keys'));
+	} else {
+		echo '<div class="warning_msg">'._('Shell Account deactivated').'</div>';
+	}
+	echo $HTML->boxBottom();
+}
 ?>
 
 </td>

-----------------------------------------------------------------------

Summary of changes:
 src/www/account/index.php | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list