[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1795-gfba856b

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Mon May 8 21:41:05 CEST 2017


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  fba856b18bcbb5b2b8004fc2fb79a0d4a4b765f2 (commit)
      from  188d548c380cbf3de942575346699c3270de5b4b (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=fba856b18bcbb5b2b8004fc2fb79a0d4a4b765f2

commit fba856b18bcbb5b2b8004fc2fb79a0d4a4b765f2
Author: Marc-Etienne Vargenau <Marc-Etienne.Marc-Etienne at alcatel-lucent.com>
Date:   Mon May 8 21:40:59 2017 +0200

    private

diff --git a/src/www/survey/include/SurveyHTML.class.php b/src/www/survey/include/SurveyHTML.class.php
index 5afb691..8e56718 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -621,7 +621,7 @@ class SurveyHTML extends FFError {
 
 				for ($j=5; $j>=0; $j--) {
 					$percent = (float)$results[$j]*100/$votes;
-					$ret.= $this->_makeBar($arr_name[$j].' ('.$results[$j].')', $percent, $arr_color[$j]);
+					$ret.= $this->makeBar($arr_name[$j].' ('.$results[$j].')', $percent, $arr_color[$j]);
 				}
 				$ret.= '</table>';
 			}
@@ -647,7 +647,7 @@ class SurveyHTML extends FFError {
 				$ret.= '<table style="padding-left: 3em; width: 100%">';
 				for ($j=1; $j<=3; $j++) {
 					$result_per[$j] = (float)$res[$j]*100/$votes;
-					$ret.= $this->_makeBar($arr_name[$j].' ('.$res[$j].')', $result_per[$j], $arr_color[$j]);
+					$ret.= $this->makeBar($arr_name[$j].' ('.$res[$j].')', $result_per[$j], $arr_color[$j]);
 				}
 				$ret.= '</table>';
 			}
@@ -661,8 +661,8 @@ class SurveyHTML extends FFError {
 		case 5:	/* This is a text-field question. */
 			if ($show_comment) {
 				for($j=0; $j<$totalCount; $j++) {
-					$ret.='<hr /><strong>'._('Comments').
-						' # '.($j+1).'/'.$totalCount. '</strong><p/>';
+					$ret.='<hr /><p><strong>'._('Comments').
+						' # '.($j+1).'/'.$totalCount. '</strong></p>';
 					$ret.='<pre>';
 					$words = explode(" ",$results[$j]);
 					$linelength = 0;
@@ -705,14 +705,14 @@ class SurveyHTML extends FFError {
 	}
 
 	/**
-	 * _makeBar - make Precentage bar as a cell in a table. Starts with <tr> and ends with </tr>
+	 * makeBar - make Percentage bar as a cell in a table. Starts with <tr> and ends with </tr>
 	 *
 	 * @param	string	$name		Name
 	 * @param	int		$percent	Percentage of the name
 	 * @param	string	$color		Color
 	 * @return	string
 	 */
-	function _makeBar($name, $percent, $color) {
+	private function makeBar($name, $percent, $color) {
 		$ret = '<tr><td style="width: 30%">'.$name.'</td><td>';
 		$ret.= '<table style="width: '.$percent.'%"><tr>';
 		if ($percent) {
@@ -724,7 +724,7 @@ class SurveyHTML extends FFError {
 		return $ret;
 	}
 
-	function drawGraph($id, $graphType, $legend, $values) {
+	private function drawGraph($id, $graphType, $legend, $values) {
 		switch($graphType) {
 			case 'pie': {
 				$ret = '<script type="text/javascript">//<![CDATA['."\n";

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

Summary of changes:
 src/www/survey/include/SurveyHTML.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list