Dev More cleanup

LimeSurvey · Aug 24, 2015 · 8fc56ca · 8fc56ca
1 parent be28b97
commit 8fc56ca
Show file tree

Hide file tree

Showing 35 changed files with 41 additions and 3,783 deletions.
diff --git a/application/components/LocalizedFormatter.php b/application/components/LocalizedFormatter.php
@@ -23,16 +23,18 @@ public function formatBooleanIcon($value) {
     public function formatPercentage($factor) {
         return number_format($factor * 100, 1) . '%';
     }
-
-    public function formatEmail($email) {
-        $encoded = '';
-        foreach (str_split($email, 1) as $character) {
-            $ord = ord($character);
-            $encoded .= '&#';
-            $encoded .= rand(0, 1) === 0 ? 'x' . dechex($ord) : $ord;
-            $encoded .= ';';
-        }
-        return $encoded;
-    }
+    /**
+     * This encodes an email, but it breaks the mailto link. For now this has been disabled.
+     */
+//    public function formatEmail($email) {
+//        $encoded = '';
+//        foreach (str_split($email, 1) as $character) {
+//            $ord = ord($character);
+//            $encoded .= '&#';
+//            $encoded .= rand(0, 1) === 0 ? 'x' . dechex($ord) : $ord;
+//            $encoded .= ';';
+//        }
+//        return parent::formatEmail($encoded);
+//    }
 
 }
diff --git a/application/controllers/PrintanswersController.php b/application/controllers/PrintanswersController.php
@@ -57,7 +57,6 @@ function actionView($surveyid,$printableexport=FALSE)
                 $iSurveyID=0;
                 $sLanguage = Yii::app()->getConfig("defaultlang");
             }
-            SetSurveyLanguage($iSurveyID, $sLanguage);
             $aSurveyInfo = getSurveyInfo($iSurveyID,$sLanguage);
             //SET THE TEMPLATE DIRECTORY
              $sTemplate = $aSurveyInfo['template'];

diff --git a/application/controllers/Statistics_userController.php b/application/controllers/Statistics_userController.php
@@ -138,8 +138,6 @@ function actionAction($surveyid,$language=null)
         {
             $sLanguage=sanitize_languagecode($sLanguage);
         }
-        //set survey language for translations
-        SetSurveyLanguage($iSurveyID, $sLanguage);
         //Create header
         sendCacheHeaders();
         $condition = false;

diff --git a/application/controllers/admin/printablesurvey.php b/application/controllers/admin/printablesurvey.php
@@ -43,7 +43,6 @@ function index($surveyid, $lang = null)
             $aSurveyInfo=getSurveyInfo($surveyid,$lang);
             if (!($aSurveyInfo))
                 $this->getController()->error('Invalid survey ID');
-            SetSurveyLanguage($surveyid,$lang);
             $sLanguageCode=App()->language;
 
             $templatename = $aSurveyInfo['template'];

diff --git a/application/controllers/admin/surveypermission.php b/application/controllers/admin/surveypermission.php