From 2cb656cf7af0d018c36e36eccb53240a1dd384af Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 05 Sep 2012 04:52:45 -0400
Subject: [PATCH] Fixed: "old" style folder protection without comment lines in htaccess (3.0.4.6) get removed, too.
---
install/lib/install.lib.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 71ebe0b..f901264 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -163,9 +163,9 @@
} elseif(strstr(trim(file_get_contents('/etc/debian_version')),'6.0') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
$distname = 'Debian';
$distver = 'Wheezy/Sid';
- $distid = 'debian70';
+ $distid = 'debian60';
$distbaseid = 'debian';
- swriteln("Operating System: Debian 6.0 (Squeeze/Sid) or compatible\n");
+ swriteln("Operating System: Debian 7.0 (Wheezy/Sid) or compatible\n");
} else {
$distname = 'Debian';
$distver = 'Unknown';
@@ -723,7 +723,7 @@
if(is_file($ispconfig_vhost_file)) {
$tmp = file_get_contents($ispconfig_vhost_file);
preg_match($regex,$tmp,$matches);
- $port_number = intval($matches[1]);
+ $port_number = @intval($matches[1]);
if($port_number > 0) {
return $port_number;
} else {
--
Gitblit v1.9.1