[Fusionforge-commits] FusionForge branch master updated. 92bba9113354ce827852b5f820312ce6c57514dd

[Alain Peyrat]

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  92bba9113354ce827852b5f820312ce6c57514dd (commit)
      from  445eb1bf85103fd874c78dad364cadccb18b297a (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 92bba9113354ce827852b5f820312ce6c57514dd
Author: Alain Peyrat <aljeux at free.fr>
Date:   Tue Nov 13 13:00:33 2012 +0100

    Pass group_id to pricacy.php to fix menu navigation

diff --git a/src/www/include/vote_function.php b/src/www/include/vote_function.php
index a3e310d..f60942b 100644
--- a/src/www/include/vote_function.php
+++ b/src/www/include/vote_function.php
@@ -280,7 +280,7 @@ if (db_numrows($result) > 0) {
 
 	<input type="submit" name="submit" value="<?php echo _('Submit') ?>" />
 	<br />
-	<?php util_make_link ('/survey/privacy.php',_('Survey Privacy')) ?>
+	<?php util_make_link ('/survey/privacy.php?group_id='.$group_id,_('Survey Privacy')) ?>
 	</td></tr>
 	</form>
 	</table>
diff --git a/src/www/survey/include/SurveyHTML.class.php b/src/www/survey/include/SurveyHTML.class.php
index a74282d..164e3a3 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -552,7 +552,7 @@ class SurveyHTML extends Error {
 
 		$ret.='<tr><td class="align-center" colspan="2">'.
 			'<input type="submit" name="submit" value="'._('Submit').'" />'.
-			'<br />'.util_make_link ('/survey/privacy.php',_('Survey Privacy')).
+			'<br />'.util_make_link ('/survey/privacy.php?group_id='.$group_id,_('Survey Privacy')).
 			'</td></tr></form></table>';
 
 		return $ret;
diff --git a/src/www/survey/privacy.php b/src/www/survey/privacy.php
index 7be9b4f..addd2f5 100644
--- a/src/www/survey/privacy.php
+++ b/src/www/survey/privacy.php
@@ -27,6 +27,11 @@ require_once $gfcommon.'include/pre.php';
 require_once $gfcommon.'survey/SurveyFactory.class.php';
 require_once $gfwww.'survey/include/SurveyHTML.class.php';
 
+$group_id = getIntFromRequest('group_id');
+if (!$group_id) {
+	exit_no_group();
+}
+
 /* Show header */
 $title = _('Survey Privacy');
 $sh = new SurveyHtml();
diff --git a/src/www/survey/survey.php b/src/www/survey/survey.php
index 1efa198..0e2ff64 100644
--- a/src/www/survey/survey.php
+++ b/src/www/survey/survey.php
@@ -45,14 +45,14 @@ if (!session_loggedin()) {
 	exit_not_logged_in();
 }
 
-$sh = new  SurveyHtml();
+$sh = new SurveyHtml();
 $s = new Survey($g, $survey_id);
 
-$title = sprintf(_('Vote for Survey: %1$s'), $s->getTitle());
+$title = _('Vote for Survey') . _(': ') . $s->getTitle();
 $sh->header(array('title'=>$title));
 
 if (!$survey_id) {
-    echo '<div class="error">'._('For some reason, the Project ID or Survey ID did not make it to this page').'</div>';
+    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));

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

Summary of changes:
 src/www/include/vote_function.php           |    2 +-
 src/www/survey/include/SurveyHTML.class.php |    2 +-
 src/www/survey/privacy.php                  |    5 +++++
 src/www/survey/survey.php                   |    6 +++---
 4 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge