[Fusionforge-commits] FusionForge branch master updated. 7c50aac4f698810aab3554536da0aead92281a89

Roland Mas lolando at fusionforge.org
Wed Feb 6 14:39:48 CET 2013


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, master has been updated
       via  7c50aac4f698810aab3554536da0aead92281a89 (commit)
       via  0f4617911099c8ce5e34b7bd4b08c1051c72dbd3 (commit)
       via  1db48658c1775ed1585de7791fd98c1221270e41 (commit)
      from  57c59c9ef57c2f36a77cfe86e5b48d057a08ba40 (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 -----------------------------------------------------------------
commit 7c50aac4f698810aab3554536da0aead92281a89
Author: Roland Mas <lolando at debian.org>
Date:   Wed Feb 6 14:26:39 2013 +0100

    Patch [#475] from Jean-Christophe Masson to fix alignment of icons in a widget

diff --git a/src/common/widget/Widget_MyArtifacts.class.php b/src/common/widget/Widget_MyArtifacts.class.php
index e93cbc8..301ddc6 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -273,7 +273,7 @@ class Widget_MyArtifacts extends Widget {
 		//work on the tracker of the last round if there was one
 		if ($atid_old != 0 && $count_aids != 0) {
 			list($hide_now,$count_diff,$hide_url) = my_hide_url('artifact',$atid_old,$hide_item_id,$count_aids,$hide_artifact);
-			$html_hdr = ($j ? '<tr class="boxitem"><td colspan="3">' : '').
+			$html_hdr = '<tr class="boxitem"><td colspan="3">'.
 				$hide_url.
 				util_make_link('/tracker/?group_id='.$group_id_old, $group_name, array('class'=>'tabtitle-nw', 'title'=>_('Browse Trackers List for this project'))).
 				' - '.
diff --git a/src/common/widget/Widget_MyMonitoredDocuments.class.php b/src/common/widget/Widget_MyMonitoredDocuments.class.php
index 333d1f2..c22d105 100644
--- a/src/common/widget/Widget_MyMonitoredDocuments.class.php
+++ b/src/common/widget/Widget_MyMonitoredDocuments.class.php
@@ -71,7 +71,7 @@ class Widget_MyMonitoredDocuments extends Widget {
 
 				list($hide_now,$count_diff,$hide_url) = my_hide_url('document',$group_id,$hide_item_id,$rows2,$hide_document);
 
-				$html_hdr = ($j ? '<tr class="boxitem"><td colspan="2">' : '').
+				$html_hdr = '<tr class="boxitem"><td colspan="2">'.
 				$hide_url.'<a href="/docman/?group_id='.$group_id.'">'.
 				db_result($result,$j,'group_name').'</a>    ';
 
diff --git a/src/common/widget/Widget_MyMonitoredForums.class.php b/src/common/widget/Widget_MyMonitoredForums.class.php
index a8881c3..97b3e62 100644
--- a/src/common/widget/Widget_MyMonitoredForums.class.php
+++ b/src/common/widget/Widget_MyMonitoredForums.class.php
@@ -106,7 +106,7 @@ class Widget_MyMonitoredForums extends Widget {
 
 				list($hide_now,$count_diff,$hide_url) = my_hide_url('forum',$group_id,$hide_item_id,$rows2,$hide_forum);
 
-				$html_hdr = ($j ? '<tr class="boxitem"><td colspan="2">' : '').
+				$html_hdr = '<tr class="boxitem"><td colspan="2">'.
 				$hide_url.'<a href="/forum/?group_id='.$group_id.'">'.
 				$glist[$j]['group_name'].'</a>    ';
 
diff --git a/src/common/widget/Widget_MyMonitoredFp.class.php b/src/common/widget/Widget_MyMonitoredFp.class.php
index 4833d49..2a16ded 100644
--- a/src/common/widget/Widget_MyMonitoredFp.class.php
+++ b/src/common/widget/Widget_MyMonitoredFp.class.php
@@ -87,7 +87,7 @@ class Widget_MyMonitoredFp extends Widget {
 
                 list($hide_now,$count_diff,$hide_url) = my_hide_url('frs',$group_id,$hide_item_id,$rows2,$hide_frs);
 
-                $html_hdr = ($j ? '<tr class="boxitem"><td colspan="2">' : '').
+                $html_hdr = '<tr class="boxitem"><td colspan="2">'.
                     $hide_url.'<a href="/project/?group_id='.$group_id.'">'.
                     db_result($result,$j,'group_name').'</a>    ';
 
diff --git a/src/common/widget/Widget_MySurveys.class.php b/src/common/widget/Widget_MySurveys.class.php
index e61bdbc..acf0ad7 100644
--- a/src/common/widget/Widget_MySurveys.class.php
+++ b/src/common/widget/Widget_MySurveys.class.php
@@ -59,9 +59,7 @@ class Widget_MySurveys extends Widget {
 			global $HTML;
 			$request =& HTTPRequest::instance();
 			$html_my_surveys .= '<table style="width:100%">';
-			$j = 0;
 			foreach ($projects as $project) {
-				$j++;
 				$group_id = $project->getID() ;
 				$surveyfacto = new SurveyFactory($project);
 				$surveys = $surveyfacto->getSurveys();
@@ -83,7 +81,7 @@ class Widget_MySurveys extends Widget {
 
 				list($hide_now,$count_diff,$hide_url) = my_hide_url('survey',$group_id,$hide_item_id,count($surveys),$hide_survey);
 
-				$html_hdr = ($j ? '<tr class="boxitem"><td colspan="2">' : '').
+				$html_hdr = '<tr class="boxitem"><td colspan="2">'.
 					$hide_url.'<a href="/survey/?group_id='.$group_id.'">'.
 					$project->getPublicName().'</a>    ';
 
diff --git a/src/common/widget/Widget_MyTasks.class.php b/src/common/widget/Widget_MyTasks.class.php
index 9439769..7b60399 100644
--- a/src/common/widget/Widget_MyTasks.class.php
+++ b/src/common/widget/Widget_MyTasks.class.php
@@ -95,7 +95,7 @@ class Widget_MyTasks extends Widget {
 
                 list($hide_now,$count_diff,$hide_url) = my_hide_url('pm',$group_project_id,$hide_item_id,$rows2,$hide_pm);
 
-                $html_hdr = ($j ? '<tr class="boxitem"><td colspan="3">' : '').
+                $html_hdr = '<tr class="boxitem"><td colspan="3">'.
                     $hide_url.'<a href="/pm/task.php?group_id='.$group_id.
                     '&group_project_id='.$group_project_id.'">'.
                     db_result($result,$j,'group_name').' - '.

commit 0f4617911099c8ce5e34b7bd4b08c1051c72dbd3
Author: Roland Mas <lolando at debian.org>
Date:   Wed Feb 6 14:25:42 2013 +0100

    Patch [#474] from Jean-Christophe Masson to fix display in the monitored documents widget

diff --git a/src/common/widget/Widget_MyMonitoredDocuments.class.php b/src/common/widget/Widget_MyMonitoredDocuments.class.php
index 937f5b4..333d1f2 100644
--- a/src/common/widget/Widget_MyMonitoredDocuments.class.php
+++ b/src/common/widget/Widget_MyMonitoredDocuments.class.php
@@ -69,7 +69,7 @@ class Widget_MyMonitoredDocuments extends Widget {
 					$hide_document = null;
 				}
 
-				list($hide_now,$count_diff,$hide_url) = my_hide_url('document',$group_id,$hide_item_id,$rows,$hide_document);
+				list($hide_now,$count_diff,$hide_url) = my_hide_url('document',$group_id,$hide_item_id,$rows2,$hide_document);
 
 				$html_hdr = ($j ? '<tr class="boxitem"><td colspan="2">' : '').
 				$hide_url.'<a href="/docman/?group_id='.$group_id.'">'.
@@ -91,7 +91,7 @@ class Widget_MyMonitoredDocuments extends Widget {
 					}
 				}
 
-				$html_hdr .= '['.$rows2.($count_new ? ", <b>".sprintf(_('%s new'), array($count_new))."</b>]" : ']').'</td></tr>';
+				$html_hdr .= '['.$rows2.($count_new ? ", <b>".sprintf(_('%s new'), $count_new)."</b>]" : ']').'</td></tr>';
 				$html_my_monitored_documents .= $html_hdr.$html;
 			}
 			$html_my_monitored_documents .= '</table>';

commit 1db48658c1775ed1585de7791fd98c1221270e41
Author: Roland Mas <lolando at debian.org>
Date:   Wed Feb 6 14:24:28 2013 +0100

    Patch [#444] from Jean-Christophe Masson to fix errors during login validation

diff --git a/src/www/account/verify.php b/src/www/account/verify.php
index f388058..ed8febb 100644
--- a/src/www/account/verify.php
+++ b/src/www/account/verify.php
@@ -35,54 +35,41 @@ if (getStringFromRequest('submit')) {
 	$passwd = getStringFromRequest('passwd');
 
 	if (!$loginname) {
-		exit_missing_param('',array(_('UserName')),'my');
+		$error_msg = _('Missing required parameters : ')._('UserName');
 	}
 
 	$u = user_get_object_by_name($loginname);
 	if (!$u && forge_get_config('require_unique_email')) {
 		$u = user_get_object_by_email ($loginname);
 	}
+	$confirm_hash = html_clean_hash_string($confirm_hash);
 	if (!$u || !is_object($u)) {
-		exit_error(_('Could Not Get User'),'home');
+		$error_msg = _('Invalid Password Or User Name');
 	} elseif ($u->isError()) {
-		exit_error($u->getErrorMessage(),'my');
-	}
-
-	if ($u->getStatus()=='A'){
-		exit_error(_('Account already active.'),'my');
-	}
-
-	$confirm_hash = html_clean_hash_string($confirm_hash);
-
-	if ($confirm_hash != $u->getConfirmHash()) {
-		exit_error(_('Cannot confirm account identity - invalid confirmation hash (or login name)'),'my');
-	}
-
-	if (!session_login_valid($loginname, $passwd, 1)) {
-		exit_permission_denied(_('Credentials you entered do not correspond to valid account.'),'my');
-	}
-
-	if (!$u->setStatus('A')) {
-		exit_error( _('Error while activiting account').': '.$u->getErrorMessage(),'my');
+		$error_msg = $u->getErrorMessage();
+	} elseif ($u->getStatus()=='A'){
+		$error_msg = _('Account already active.');
+	} elseif ($confirm_hash != $u->getConfirmHash()) {
+		$error_msg = _('Cannot confirm account identity - invalid confirmation hash (or login name)');
+	} elseif (!session_login_valid($loginname, $passwd, 1)) {
+		$warning_msg = _('Credentials you entered do not correspond to valid account.');
+	} elseif (!$u->setStatus('A')) {
+		$error_msg = _('Error while activiting account').': '.$u->getErrorMessage();
 	} else {
 		if (forge_get_config('user_notification_on_activation')) {
 			$u->setAdminNotification();
 		}
+		session_redirect("/account/first.php");
 	}
-
-	session_redirect("/account/first.php");
 }
 
 $HTML->header(array('title'=>_('Verify')));
 
 echo '<p>' . _('In order to complete your registration, login now. Your account will then be activated for normal logins.') . '</p>';
 
-if (isset($GLOBALS['error_msg']) && $GLOBALS['error_msg'] != '') {
-	print '<p class="error">'.$GLOBALS['error_msg'].'</p>';
-}
 ?>
 
-<form action="<?php echo util_make_url('/account/verify.php'); ?>" method="post">
+<form action="<?php echo util_make_url('/account/verify.php?confirm_hash='.$confirm_hash); ?>" method="post">
 
 <p><?php
 if (forge_get_config('require_unique_email')) {
@@ -100,3 +87,4 @@ if (forge_get_config('require_unique_email')) {
 
 <?php
 $HTML->footer(array());
+?>

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

Summary of changes:
 src/common/widget/Widget_MyArtifacts.class.php     |    2 +-
 .../widget/Widget_MyMonitoredDocuments.class.php   |    6 +--
 .../widget/Widget_MyMonitoredForums.class.php      |    2 +-
 src/common/widget/Widget_MyMonitoredFp.class.php   |    2 +-
 src/common/widget/Widget_MySurveys.class.php       |    4 +-
 src/common/widget/Widget_MyTasks.class.php         |    2 +-
 src/www/account/verify.php                         |   42 +++++++-------------
 7 files changed, 23 insertions(+), 37 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list