[Fusionforge-commits] FusionForge branch master updated. 63413f0b519bf206fec846384775c788597c17d6

Alain Peyrat aljeux at fusionforge.org
Fri Aug 30 14:58:33 CEST 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  63413f0b519bf206fec846384775c788597c17d6 (commit)
       via  72617a8ce88c7f087f92de960aea1f5746d98b27 (commit)
      from  2cc50003e7225668ce5a2a068827899e584ee79c (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 63413f0b519bf206fec846384775c788597c17d6
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri Aug 30 14:58:05 2013 +0200

    No need of utf8_decode() for jqplot

diff --git a/src/common/reporting/report_utils.php b/src/common/reporting/report_utils.php
index 883f243..2f70328 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -232,7 +232,7 @@ function report_pie_arr($labels, $vals, $format=1) {
 		if (($vals[$i]/$total) < .02) {
 			$rem += $vals[$i];
 		} else {
-			$pie_labels[]=utf8_decode(util_unconvert_htmlspecialchars($labels[$i]))." (". number_format($vals[$i],$format) .") ";
+			$pie_labels[]=util_unconvert_htmlspecialchars($labels[$i])." (". number_format($vals[$i],$format) .") ";
 			$pie_vals[]=$vals[$i];
 		}
 	}
@@ -319,7 +319,7 @@ function trackeract_graph($group_id, $area, $SPAN, $start, $end, $atid) {
 	}
 	echo 'jQuery(document).ready(function(){
 		plot'.$chartid.' = jQuery.jqplot (\'chart'.$chartid.'\', series, {
-			title : \''.utf8_decode(_('Tracker Activity')).' ('.strftime('%x',$start).' - '.strftime('%x',$end).') \',
+			title : \''._('Tracker Activity').' ('.strftime('%x',$start).' - '.strftime('%x',$end).') \',
 			axesDefaults: {
 				tickOptions: {
 					angle: -90,
@@ -404,7 +404,7 @@ function trackerpie_graph($group_id, $area, $SPAN, $start, $end, $atid) {
 	echo 'jQuery(document).ready(function(){
 		plot'.$chartid.' = jQuery.jqplot (\'chart'.$chartid.'\', [data],
 			{
-				title : \''.utf8_decode($areaname." (".strftime('%x',$start) ." - ". strftime('%x',$end) .")").'\',
+				title : \''.$areaname." (".strftime('%x',$start) ." - ". strftime('%x',$end) .")".'\',
 				seriesDefaults: {
 					// Make this a pie chart.
 					renderer: jQuery.jqplot.PieRenderer,
@@ -829,7 +829,7 @@ function report_actgraph($type, $SPAN, $start, $end, $id, $area) {
 	}
 	echo 'jQuery(document).ready(function(){
 			plot'.$chartid.' = jQuery.jqplot (\'chart'.$chartid.'\', series, {
-				title : \''.utf8_decode($areaname).' ('.strftime('%x', $start).' - '.strftime('%x', $end).') \',
+				title : \''.$areaname.' ('.strftime('%x', $start).' - '.strftime('%x', $end).') \',
 				axesDefaults: {
 					tickRenderer: jQuery.jqplot.CanvasAxisTickRenderer,
 					tickOptions: {
@@ -1097,7 +1097,7 @@ function report_sitetimebargraph($start, $end) {
 		}
 		echo 'jQuery(document).ready(function(){
 				plot'.$chartid.' = jQuery.jqplot (\'chart'.$chartid.'\', series, {
-					title : \''.utf8_decode($areaname).' ('.strftime('%x', $start).' - '.strftime('%x', $end).') \',
+					title : \''.$areaname.' ('.strftime('%x', $start).' - '.strftime('%x', $end).') \',
 					axesDefaults: {
 						tickRenderer: jQuery.jqplot.CanvasAxisTickRenderer,
 						tickOptions: {

commit 72617a8ce88c7f087f92de960aea1f5746d98b27
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri Aug 30 14:54:41 2013 +0200

    Fix: No user activity reporting for frs and pages

diff --git a/src/common/reporting/report_utils.php b/src/common/reporting/report_utils.php
index 8e507a0..883f243 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -131,12 +131,14 @@ function report_area_box($name='area', $selected='1', $Group=false) {
 		$use_docman = $Group->usesDocman();
 		$use_pm = $Group->usesPM();
 		$use_frs = $Group->usesFRS();
+		$use_pageviews = true;
 	} else {
 		$use_tracker = forge_get_config('use_tracker');
 		$use_forum = forge_get_config('use_forum');
 		$use_docman = forge_get_config('use_docman');
 		$use_pm = forge_get_config('use_pm');
-		$use_frs = forge_get_config('use_frs');
+		$use_frs = false; // Not implemented in ReportUserAct: forge_get_config('use_frs');
+		$use_pageviews = false;
 	}
 	if ($use_tracker) {
 		$arr[]='tracker';
@@ -158,8 +160,10 @@ function report_area_box($name='area', $selected='1', $Group=false) {
 		$arr[]='downloads';
 		$arr2[]=_('Downloads');
 	}
-	$arr[]='pageviews';
-	$arr2[]=_('Page Views');
+	if ($use_pageviews) {
+		$arr[]='pageviews';
+		$arr2[]=_('Page Views');
+	}
 
 	if (is_object($Group) && $Group->getID()) {
 		$hookParams['group'] = $Group->getID();

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

Summary of changes:
 src/common/reporting/report_utils.php |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list