[Fusionforge-commits] FusionForge branch master updated. 6.0.4-782-g3cea2fe

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Mon Aug 22 16:25:40 CEST 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, master has been updated
       via  3cea2fe1d0bc5b6a3ab6a1f11198a6fc55b41003 (commit)
       via  f79a0fd13dfb0d11fe016ffa6dfe93a84025a18f (commit)
      from  e9fda7d65384806ca09b6b121003e4d567c2c16e (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=3cea2fe1d0bc5b6a3ab6a1f11198a6fc55b41003

commit 3cea2fe1d0bc5b6a3ab6a1f11198a6fc55b41003
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Aug 22 16:20:41 2016 +0200

    PHP Doc

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index f0ce4c4..465f87f 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -259,6 +259,8 @@ class Layout extends FFError {
 	/**
 	 * header() - generates the complete header of page by calling
 	 * headerStart() and bodyHeader().
+	 *
+	 * @param	array	$params		Header parameters array
 	 */
 	function header($params) {
 		$this->headerStart($params);
@@ -634,14 +636,16 @@ if (isset($params['group']) && $params['group']) {
 	 * @return	string	the class code
 	 */
 	function boxGetAltRowStyle($i, $classonly = false) {
-		if ($i % 2 == 0)
+		if ($i % 2 == 0) {
 			$ret = 'altRowStyleEven';
-		else
+		} else {
 			$ret = 'altRowStyleOdd';
-		if ($classonly)
+		}
+		if ($classonly) {
 			return $ret;
-		else
+		} else {
 			return 'class="'.$ret.'"';
+		}
 	}
 
 	/**
@@ -877,9 +881,7 @@ if (isset($params['group']) && $params['group']) {
 	 * @return	string	Html to start a submenu.
 	 */
 	function beginSubMenu() {
-		$return = '
-			<p><strong>';
-		return $return;
+		return '<p><strong>';
 	}
 
 	/**
@@ -888,8 +890,7 @@ if (isset($params['group']) && $params['group']) {
 	 * @return	string	Html to end a submenu.
 	 */
 	function endSubMenu() {
-		$return = '</strong></p>';
-		return $return;
+		return '</strong></p>';
 	}
 
 	/**
@@ -1559,6 +1560,7 @@ if (isset($params['group']) && $params['group']) {
 	 * @param	integer	$maxElements	max number of Elements to display
 	 * @param	string	$actionUrl	next / prev Url to click
 	 * @param	array	$htmlAttr	html attributes to set.
+	 * @return	string
 	 */
 	function paging_top($start = 0, $paging = 25, $totalElements = 0, $maxElements = 0, $actionUrl = '/', $htmlAttr = array()) {
 		$html_content = '';
@@ -1587,6 +1589,7 @@ if (isset($params['group']) && $params['group']) {
 	 * @param	integer	$paging		number of element per page
 	 * @param	integer	$totalElements	total number of Elements to display
 	 * @param	string	$actionUrl	next / prev Url to click
+	 * @return	string
 	 */
 	function paging_bottom($start = 0, $paging = 25, $totalElements = 0, $actionUrl = '/') {
 		$html_content = '';

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

commit f79a0fd13dfb0d11fe016ffa6dfe93a84025a18f
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Aug 22 16:20:04 2016 +0200

    Whitespace

diff --git a/src/www/project/admin/roleedit.php b/src/www/project/admin/roleedit.php
index f5ab943..0f6105d 100644
--- a/src/www/project/admin/roleedit.php
+++ b/src/www/project/admin/roleedit.php
@@ -79,10 +79,10 @@ if (getStringFromRequest('submit')) {
 	if (($role->getHomeProject() != NULL)
 		&& ($role->getHomeProject()->getID() == $group_id)) {
 		$role_name = trim(getStringFromRequest('role_name'));
-		$public = getIntFromRequest('public') ? true : false ;
+		$public = getIntFromRequest('public') ? true : false;
 	} else {
-		$role_name = $role->getName() ;
-		$public = $role->isPublic() ;
+		$role_name = $role->getName();
+		$public = $role->isPublic();
 	}
 	if (!$role_name) {
 		$error_msg .= _('Missing Role Name');

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

Summary of changes:
 src/www/include/Layout.class.php   | 21 ++++++++++++---------
 src/www/project/admin/roleedit.php |  6 +++---
 2 files changed, 15 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list