Dev Couple small path fixes

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8985 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jul 27, 2010 · 00c0dd2 · 00c0dd2
1 parent 1798805
commit 00c0dd2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/admin/login_check.php b/admin/login_check.php
@@ -150,7 +150,7 @@
     if($action == "forgotpassword")
     {
         $loginsummary = '
-			<form name="forgot" id="forgot" method="post" action="'.$rooturl.'/admin/admin.php" >
+			<form name="forgot" id="forgot" method="post" action="'.$homeurl.'/admin.php" >
 				<p><strong>'.$clang->gT('You have to enter user name and email.').'</strong></p>
 
 				<table>
@@ -189,11 +189,11 @@
 
         if (!isset($logoutsummary))
         {
-            $loginsummary = "<form name='loginform' id='loginform' method='post' action='$rooturl/admin/admin.php' ><p><strong>".$clang->gT("You have to login first.")."</strong><br />	<br />";
+            $loginsummary = "<form name='loginform' id='loginform' method='post' action='$homeurl/admin.php' ><p><strong>".$clang->gT("You have to login first.")."</strong><br />	<br />";
         }
         else
         {
-            $loginsummary = "<form name='loginform' id='loginform' method='post' action='$rooturl/admin/admin.php' ><br /><strong>".$logoutsummary."</strong><br />	<br />";
+            $loginsummary = "<form name='loginform' id='loginform' method='post' action='$homeurl/admin.php' ><br /><strong>".$logoutsummary."</strong><br />	<br />";
         }
 
         $loginsummary .= "

diff --git a/admin/remotecontrol/lsrc.server.php b/admin/remotecontrol/lsrc.server.php
@@ -25,7 +25,7 @@
 
 // to generate statistics
 include_once($rootdir."/classes/core/sanitize.php");
-include_once($rootdir.'/admin/statistics_function.php');
+include_once($homedir.'/statistics_function.php');
 
 /**
  * if ?wsdl is set, generate wsdl with correct uri and send it back to whoever requesting

diff --git a/admin/statistics_function.php b/admin/statistics_function.php
@@ -3037,7 +3037,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
                             $pdf->AddPage('P','A4');
 
                             $pdf->titleintopdf($pdfTitle,$titleDesc);
-                            $pdf->Image($tempdir."/".$cachefilename, 5, 70, 200, 200, '', $rooturl."/admin/admin.php?sid=$surveyid", 'B', true, 150,'',false,false,0,true);
+                            $pdf->Image($tempdir."/".$cachefilename, 5, 70, 200, 200, '', $homeurl."/admin.php?sid=$surveyid", 'B', true, 150,'',false,false,0,true);
 
                             break;
                         case 'html':

diff --git a/config-defaults.php b/config-defaults.php
@@ -468,7 +468,7 @@
 // example: "x:/limesurvey/tmp". We don't know why.
 $fckeditordir   =   "$homeurl/scripts/fckeditor.266";
 $fckeditexpandtoolbar   =   true; // defines if the FCKeditor toolbar should be opened by default
-$pdfexportdir   = '/admin/classes/tcpdf';  //Directory with the tcpdf.php extensiontcpdf.php
+$pdfexportdir   = "$homedir/classes/tcpdf";  //Directory with the tcpdf.php extensiontcpdf.php
 $pdffonts       = $pdfexportdir.'/fonts';  //Directory for the TCPDF fonts
 
 // Computing relative url

diff --git a/statistics_user.php b/statistics_user.php
@@ -32,12 +32,12 @@
 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
 
 
-require_once(dirname(__FILE__).'/admin/classes/core/class.progressbar.php');
+require_once($homedir.'/classes/core/class.progressbar.php');
 require_once(dirname(__FILE__).'/classes/core/startup.php');
 require_once(dirname(__FILE__).'/config-defaults.php');
 require_once(dirname(__FILE__).'/common.php');
 require_once(dirname(__FILE__).'/classes/core/language.php');
-require_once(dirname(__FILE__).'/admin/statistics_function.php');
+require_once($homedir.'/statistics_function.php');
 
 
 //XXX enable/disable this for testing