[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1beta1-122-gaeb03ad

Franck Villaume nerville at libremir.placard.fr.eu.org
Tue Feb 6 08:22:35 CET 2018


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, 6.1 has been updated
       via  aeb03ad802c8f908a29a5dea3c5002286c12a2d0 (commit)
       via  0f590a1932baed51b749954714d4525f1f5323f0 (commit)
       via  8ac36a39049502a75438f5a72de52b440e741956 (commit)
      from  aa2ce9a23b9a959a50e435f37d3db06a5e18fe36 (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=aeb03ad802c8f908a29a5dea3c5002286c12a2d0

commit aeb03ad802c8f908a29a5dea3c5002286c12a2d0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Feb 6 07:22:02 2018 +0000

    fix PHP syntax

diff --git a/src/www/account/lostlogin.php b/src/www/account/lostlogin.php
index 6a1a68f..adb1311 100644
--- a/src/www/account/lostlogin.php
+++ b/src/www/account/lostlogin.php
@@ -62,7 +62,7 @@ if (!$u || !is_object($u)) {
 if (getStringFromRequest("submit")) {
 
 	if (strlen($passwd) < 8) {
-		$message = _('You must supply valid password (at least 8 characters).').(forge_get_config('check_password_strength') ? html_e('br')._('Must contain at least one uppercase letter, one lowercase, one digit, one non-alphanumeric character.') : '')
+		$message = _('You must supply valid password (at least 8 characters).').(forge_get_config('check_password_strength') ? html_e('br')._('Must contain at least one uppercase letter, one lowercase, one digit, one non-alphanumeric character.') : '');
 		exit_error($message, 'my');
 	}
 
@@ -75,7 +75,7 @@ if (getStringFromRequest("submit")) {
 		// Invalidate confirm hash
 		$u->setNewEmailAndHash('', 0);
 		$feedback = _('Password changed successfully');
-		$HTML->header(array('title' => _('Lost Account Password'));
+		$HTML->header(array('title' => _('Lost Account Password')));
 		print '<p>';
 		printf (_('Congratulations, you have re-set your account password. You may <a href="%s">login</a> to the site now.'),
 			  util_make_url ("/account/login.php"));

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0f590a1932baed51b749954714d4525f1f5323f0

commit 0f590a1932baed51b749954714d4525f1f5323f0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Feb 5 23:35:33 2018 +0100

    use html5 when possible: required

diff --git a/src/www/account/lostpw.php b/src/www/account/lostpw.php
index 5615d9a..98250db 100644
--- a/src/www/account/lostpw.php
+++ b/src/www/account/lostpw.php
@@ -90,7 +90,7 @@ echo $HTML->openForm(array('action' => '/account/lostpw.php', 'method' => 'post'
 <?php echo _('Login Name')._(':'); ?>
 <br />
     <label for="loginname">
-        <input id="loginname" type="text" name="loginname"/>
+        <input id="loginname" type="text" name="loginname" required='required' />
     </label>
     <br />
 <input type="submit" name="submit" value="<?php echo _('Send Lost PW Hash'); ?>" />

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8ac36a39049502a75438f5a72de52b440e741956

commit 8ac36a39049502a75438f5a72de52b440e741956
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Feb 5 23:34:14 2018 +0100

    account password lost facility: add missing translation, add message when check_password_strength used

diff --git a/src/www/account/lostlogin.php b/src/www/account/lostlogin.php
index 3e6c7f6..6a1a68f 100644
--- a/src/www/account/lostlogin.php
+++ b/src/www/account/lostlogin.php
@@ -61,8 +61,9 @@ if (!$u || !is_object($u)) {
 
 if (getStringFromRequest("submit")) {
 
-	if (strlen($passwd)<8) {
-		exit_error(_('You must supply valid password (at least 8 characters).'),'my');
+	if (strlen($passwd) < 8) {
+		$message = _('You must supply valid password (at least 8 characters).').(forge_get_config('check_password_strength') ? html_e('br')._('Must contain at least one uppercase letter, one lowercase, one digit, one non-alphanumeric character.') : '')
+		exit_error($message, 'my');
 	}
 
 	if ($passwd != $passwd2) {
@@ -73,9 +74,8 @@ if (getStringFromRequest("submit")) {
 
 		// Invalidate confirm hash
 		$u->setNewEmailAndHash('', 0);
-
-		$HTML->header(array('title'=>"Password changed"));
-		print '<h2>' . _('Password changed') . '</h2>';
+		$feedback = _('Password changed successfully');
+		$HTML->header(array('title' => _('Lost Account Password'));
 		print '<p>';
 		printf (_('Congratulations, you have re-set your account password. You may <a href="%s">login</a> to the site now.'),
 			  util_make_url ("/account/login.php"));
@@ -92,8 +92,7 @@ $HTML->header(array('title'=>$title));
 echo html_e('p', array(), sprintf(_('Welcome, %s. You may now change your password.'),$u->getUnixName()));
 echo $HTML->openForm(array('action' => '/account/lostlogin.php', 'method' => 'post'));
 ?>
-<p><?php echo _('New Password (at least 8 characters)')._(':'); ?>
-<br />
+<p><?php echo _('New Password (at least 8 characters)')._(':').html_e('br').(forge_get_config('check_password_strength') ? _('Must contain at least one uppercase letter, one lowercase, one digit, one non-alphanumeric character.').html_e('br') : ''); ?>
 <label for="passwd">
 	<input id="passwd" type="password" name="passwd"/>
 </label>
diff --git a/src/www/account/lostpw.php b/src/www/account/lostpw.php
index d813ce9..5615d9a 100644
--- a/src/www/account/lostpw.php
+++ b/src/www/account/lostpw.php
@@ -80,7 +80,7 @@ if (getStringFromRequest('submit')) {
 	}
 }
 
-$HTML->header(array('title'=>"Lost Account Password"));
+$HTML->header(array('title'=> _('Lost Account Password')));
 
 echo '<p>' . _('Hey... losing your password is serious business. It compromises the security of your account, your projects, and this site.') . '</p>';
 echo '<p>' . _('Clicking “Send Lost PW Hash” below will email a URL to the email address we have on file for you. In this URL is a 128-bit confirmation hash for your account. Visiting the URL will allow you to change your password online and login.') . '</p>';

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

Summary of changes:
 src/www/account/lostlogin.php | 13 ++++++-------
 src/www/account/lostpw.php    |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list