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

This commit is contained in:
Bernhard Fröhlich 2015-07-28 22:08:17 +02:00
commit 9c1a43b741
2 changed files with 3 additions and 3 deletions

View file

@ -8,7 +8,7 @@ my $KeyFile = "key_200808.pem";
my $CAfile = "CAcert_roots.pem"; my $CAfile = "CAcert_roots.pem";
my $TargetHost="secure.cacert.org"; my $TargetHost="secure.cacert.org";
my $TargetScript="cats/cats_import.php"; 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($) sub url_encode($)
{ {

View file

@ -2,7 +2,7 @@
$_SESSION['_config']['normalhostname'] = "HOSTNAME"; $_SESSION['_config']['normalhostname'] = "HOSTNAME";
$_SESSION['_config']['securehostname'] = "HOSTNAME"; $_SESSION['_config']['securehostname'] = "HOSTNAME";
$_SESSION['_config']['folder'] = "/"; $_SESSION['_config']['folder'] = "";
// Variablen intialisieren für MySQL // Variablen intialisieren für MySQL
// Do not change variable names, other scripts are parsing this file for them! // Do not change variable names, other scripts are parsing this file for them!