Fixed issue #4987: Missing footer translation in PDF-report

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9854 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Mar 8, 2011 · 6681190 · 6681190
1 parent ae9f359
commit 6681190
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/admin/statistics_function.php b/admin/statistics_function.php
@@ -209,6 +209,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
     if($outputType=='pdf')
     {
         require_once('classes/tcpdf/config/lang/eng.php');
+        global $l;
+        $l['w_page'] = $statlang->gT("Page",'unescaped');
         require_once('classes/tcpdf/mypdf.php');
 
         // create new PDF document
@@ -233,7 +235,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
         $pdf->setFooterFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_DATA));
 
         // set default header data
-        $pdf->SetHeaderData("statistics.png", 10, $statlang->gT("Quick statistics",'unescaped') , $statlang->gT("Survey")." ".$surveyid." '".html_entity_decode($surveyInfo['surveyls_title'],ENT_QUOTES,'UTF-8')."'");
+        $pdf->SetHeaderData("../../../../images/statistics.png", 10, $statlang->gT("Quick statistics",'unescaped') , $statlang->gT("Survey")." ".$surveyid." '".html_entity_decode($surveyInfo['surveyls_title'],ENT_QUOTES,'UTF-8')."'");
 
 
         // set default monospaced font

diff --git a/config-defaults.php b/config-defaults.php
@@ -530,7 +530,7 @@
 
 //DO NOT EVER CHANGE THE FOLLOWING 5 LINES ---------------
 require_once(dirname(__FILE__).'/config.php');
-if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on')
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']!='' && $_SERVER['HTTPS']!='off')
 {
        $rooturl=str_replace('http://', 'https://', $rooturl);
 }  

diff --git a/scripts/jquery/css/jquery.multiselect.css b/scripts/jquery/css/jquery.multiselect.css
@@ -22,6 +22,7 @@
 /* remove label borders in IE6 because IE6 does not support transparency */
 * html .ui-multiselect-checkboxes label { border:none }
 
+/* Some custom CSS by the LimeSurvey team */
 .ui-multiselect-close, .ui-multiselect .ui-icon-triangle-2-n-s {display:none;}
 .ui-multiselect-checkboxes .ui-state-hover {font-weight:normal;}