Merge remote-tracking branch 'origin/bug-1098' into testserver

functions/UploadResults.pl

@@ -8,7 +8,7 @@ my $KeyFile = "key_200808.pem";
 my $CAfile = "CAcert_roots.pem";
 my $TargetHost="secure.cacert.org";
 my $TargetScript="cats/cats_import.php";
-my $ConnectInc="/var/www/cats1.it-sls.de/training/public/includes/db_connect.inc";
+my $ConnectInc="/home/cats/public_html/includes/db_connect.inc";
 
 sub url_encode($)
 {

includes/db_connect.inc.template

@@ -2,7 +2,7 @@
 
 $_SESSION['_config']['normalhostname'] = "HOSTNAME";
 $_SESSION['_config']['securehostname'] = "HOSTNAME";
-$_SESSION['_config']['folder'] = "/";
+$_SESSION['_config']['folder'] = "";
 
 // Variablen intialisieren für MySQL
 // Do not change variable names, other scripts are parsing this file for them!
@@ -19,5 +19,5 @@ $database="DATABASE";
 
   // Wählt DB aus oder gibt Meldung aus
   mysql_select_db("$database") or die
- ("Die Datenbank existiert nicht"); 
+ ("Die Datenbank existiert nicht");
 ?>