Fixed issue #6846: Graph statistics in Arabic are bad

LimeSurvey · Nov 10, 2012 · 3657fba · 3657fba
1 parent b248cbc
commit 3657fba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 32 deletions.
diff --git a/application/controllers/Statistics_userController.php b/application/controllers/Statistics_userController.php
@@ -148,22 +148,6 @@ function actionAction($surveyid,$language)
             $language = Survey::model()->findByPk($iSurveyID)->language;
 
 
-
-		$chartfontfile = Yii::app()->getConfig("chartfontfile");
-		//pick the best font file if font setting is 'auto'
-		if ($chartfontfile=='auto')
-		{
-		    $chartfontfile='vera.ttf';
-		    if ( $language=='ar')
-		    {
-		        $chartfontfile='KacstOffice.ttf';
-		    }
-		    elseif  ($language=='fa' )
-		    {
-		        $chartfontfile='KacstFarsi.ttf';
-		    }
-		}
-
 		//set survey language for translations
 		$clang = SetSurveyLanguage($iSurveyID, $language);
 

diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -34,8 +34,7 @@ function createChart($iQuestionID, $iSurveyID, $type = null, $lbl, $gdata, $graw
     $scriptname = Yii::app()->getConfig("scriptname");
     $chartfontfile = Yii::app()->getConfig("chartfontfile");
     $chartfontsize = Yii::app()->getConfig("chartfontsize");
-    $language = Survey::model()->findByPk($iSurveyID)->language;
-    $statlang = $oLanguage;
+    $language = $oLanguage->langcode;
     $cachefilename = "";
 
     /* Set the fonts for the chart */
@@ -106,9 +105,7 @@ function createChart($iQuestionID, $iSurveyID, $type = null, $lbl, $gdata, $graw
                 $graph->setFontProperties($rootdir . DIRECTORY_SEPARATOR . 'fonts' . DIRECTORY_SEPARATOR . $chartfontfile, $chartfontsize);
                 $legendsize = $graph->getLegendBoxSize($DataSet->GetDataDescription());
 
-                if ($legendsize[1] < 320)
-                    $gheight = 420; else
-                    $gheight = $legendsize[1] + 100;
+                if ($legendsize[1]<320) $gheight=420; else $gheight=$legendsize[1]+100;
                 $graph = new pChart(690 + $legendsize[0], $gheight);
                 $graph->loadColorPalette($homedir . DIRECTORY_SEPARATOR . 'styles' . DIRECTORY_SEPARATOR . $admintheme . DIRECTORY_SEPARATOR . 'limesurvey.pal');
                 $graph->setFontProperties($rootdir . DIRECTORY_SEPARATOR . 'fonts' . DIRECTORY_SEPARATOR . $chartfontfile, $chartfontsize);
@@ -139,19 +136,20 @@ function createChart($iQuestionID, $iSurveyID, $type = null, $lbl, $gdata, $graw
             // this block is to remove the items with value == 0
             // and an inelegant way to remove comments from List with Comments questions
             $i = 0;
-            while (isset($gdata[$i])) {
-                if ($gdata[$i] == 0 || ($type == "O" && substr($lbl[$i], 0, strlen($statlang->gT("Comments"))) == $statlang->gT("Comments"))) {
-                    array_splice($gdata, $i, 1);
-                    array_splice($lbl, $i, 1);
-                } else {
-                    $i++;
+            while (isset ($gdata[$i]))
+            {
+                if ($gdata[$i] == 0 || ($type == "O" && substr($lbl[$i],0,strlen($oLanguage->gT("Comments")))==$oLanguage->gT("Comments")))
+                {
+                    array_splice ($gdata, $i, 1);
+                    array_splice ($lbl, $i, 1);
                 }
             }
 
-            $lblout = array();
-            if ($language == 'ar') {
-                $lblout = $lbl; //reset text order to original
-                Yii::import('application.libraries.admin.Arabic', true);
+            $lblout=array();
+            if ($language=='ar')
+            {
+                $lblout=$lbl; //reset text order to original
+                Yii::import('application.libraries.Arabic', true);
                 $Arabic = new Arabic('ArGlyphs');
                 foreach ($lblout as $kkey => $kval) {
                     if (preg_match("^[A-Za-z]^", $kval)) { //auto detect if english

diff --git a/application/libraries/Arabic.php b/application/libraries/Arabic.php
@@ -123,7 +123,7 @@ class Arabic
      */
     public function __construct($library)
     {
-        if($library[0]) $this->load($library[0]);
+        $this->load($library);
     }
 
     public function load($library)