[Fusionforge-commits] FusionForge branch master updated. 66c454ca2c5c0b19fdfc2a70324a79ab95752470

Franck VILLAUME nerville at fusionforge.org
Fri Dec 20 11:56:34 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  66c454ca2c5c0b19fdfc2a70324a79ab95752470 (commit)
       via  0fc6b1b571722b54002bea5b09c2042fc0c28f6b (commit)
       via  a736e2a9bad4c9cceadb2cce7c97b51eb8e3c303 (commit)
      from  be8fd1497bcaa34f121e205283c5fad1a650c890 (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 66c454ca2c5c0b19fdfc2a70324a79ab95752470
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Dec 20 12:56:03 2013 +0100

    space

diff --git a/src/www/survey/survey.php b/src/www/survey/survey.php
index 59ed303..6ad92d4 100644
--- a/src/www/survey/survey.php
+++ b/src/www/survey/survey.php
@@ -54,7 +54,7 @@ $sh->header(array('title'=>$title));
 if (!$survey_id) {
 	echo '<p class="error">'._('For some reason, the Project ID or Survey ID did not make it to this page').'</p>';
 } else {
-	plugin_hook ("blocks", "survey_".$s->getTitle());
+	plugin_hook("blocks", "survey_".$s->getTitle());
 	echo($sh->showSurveyForm($s));
 }
 

commit 0fc6b1b571722b54002bea5b09c2042fc0c28f6b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Dec 20 12:55:51 2013 +0100

    survey: fix php warning

diff --git a/src/www/survey/include/SurveyHTML.class.php b/src/www/survey/include/SurveyHTML.class.php
index 5d3e7c7..fbb16a7 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -44,14 +44,14 @@ class SurveyHTML extends Error {
 	 * Show survey header
 	 */
 	function header($params) {
-		global $group_id,$is_admin_page,$HTML;
+		global $group_id, $is_admin_page, $HTML;
 
 		if (!forge_get_config('use_survey')) {
 			exit_disabled();
 		}
 
-		$params['toptab']='surveys';
-		$params['group']=$group_id;
+		$params['toptab'] = 'surveys';
+		$params['group'] = $group_id;
 
 		if ($project = group_get_object($group_id)){
 			if (!$project->usesSurvey()) {
@@ -71,16 +71,24 @@ class SurveyHTML extends Error {
 						'/survey/admin/question.php?group_id='.$group_id,
 						'/survey/admin/show_results.php?group_id='.$group_id,
 						'/survey/admin/?group_id='.$group_id
+					),
+					array(
+						null,
+						null,
+						null,
+						null
 					)
 				);
 			} else {
 				$labels[] = _('Views Surveys');
 				$links[]  = '/survey/?group_id='.$group_id;
+				$arr[] = null;
 				if (forge_check_perm ('project_admin', $group_id)) {
 						$labels[] = _('Administration');
 						$links[]  = '/survey/admin/?group_id='.$group_id;
+						$arr[] = null;
 				}
-				$params['submenu'] = $HTML->subMenu($labels,$links);
+				$params['submenu'] = $HTML->subMenu($labels, $links, $arr);
 			}
 			site_project_header($params);
 		}// end if (valid group id)

commit a736e2a9bad4c9cceadb2cce7c97b51eb8e3c303
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Dec 20 12:50:54 2013 +0100

    indent

diff --git a/src/www/survey/survey.php b/src/www/survey/survey.php
index 0e2ff64..59ed303 100644
--- a/src/www/survey/survey.php
+++ b/src/www/survey/survey.php
@@ -52,10 +52,10 @@ $title = _('Vote for Survey') . _(': ') . $s->getTitle();
 $sh->header(array('title'=>$title));
 
 if (!$survey_id) {
-    echo '<p class="error">'._('For some reason, the Project ID or Survey ID did not make it to this page').'</p>';
+	echo '<p class="error">'._('For some reason, the Project ID or Survey ID did not make it to this page').'</p>';
 } else {
 	plugin_hook ("blocks", "survey_".$s->getTitle());
-    echo($sh->showSurveyForm($s));
+	echo($sh->showSurveyForm($s));
 }
 
 $sh->footer(array());

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

Summary of changes:
 src/www/survey/include/SurveyHTML.class.php |   16 ++++++++++++----
 src/www/survey/survey.php                   |    6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list