From 0f7d3e2306acbdf618ed2a2d48d1c8cf3457fd87 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 30 Jun 2010 06:06:16 -0400
Subject: [PATCH] Fixed regex for email filed to allow _ in email addresses.
---
install/lib/install.lib.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 6e9379f..3c2adc1 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -85,9 +85,9 @@
} elseif(strstr(trim(file_get_contents('/etc/debian_version')),'6.0') || trim(file_get_contents('/etc/debian_version')) == 'squeeze/sid') {
$distname = 'Debian';
$distver = 'Squeeze/Sid';
- $distid = 'debian40';
+ $distid = 'debian60';
$distbaseid = 'debian';
- swriteln("Operating System: Debian Squeeze/Sid or compatible\n");
+ swriteln("Operating System: Debian 6.0 (Squeeze/Sid) or compatible\n");
} else {
$distname = 'Debian';
$distver = 'Unknown';
@@ -113,14 +113,14 @@
swriteln("Operating System: openSUSE 11.1 or compatible\n");
} elseif(stristr(file_get_contents('/etc/SuSE-release'),'11.2')) {
$distname = 'openSUSE';
- $distver = '11.1';
- $distid = 'opensuse110';
+ $distver = '11.2';
+ $distid = 'opensuse112';
$distbaseid = 'opensuse';
swriteln("Operating System: openSUSE 11.2 or compatible\n");
} else {
$distname = 'openSUSE';
$distver = 'Unknown';
- $distid = 'opensuse110';
+ $distid = 'opensuse112';
$distbaseid = 'opensuse';
swriteln("Operating System: openSUSE or compatible, unknown version.\n");
}
--
Gitblit v1.9.1