From 374c8db63dca02dcf62d64448dc408897925c19f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 26 May 2010 08:24:42 -0400
Subject: [PATCH] Improved some list templates and the dashboard template.
---
install/install.php | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/install/install.php b/install/install.php
index 80fe681..c24bd3b 100644
--- a/install/install.php
+++ b/install/install.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -36,12 +36,12 @@
//** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n";
-echo " _____ ___________ _____ __ _
-|_ _/ ___| ___ \ / __ \ / _(_)
- | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _
- | | `--. \ __/ | | / _ \| '_ \| _| |/ _` |
- _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| |
- \___/\____/\_| \____/\___/|_| |_|_| |_|\__, |
+echo " _____ ___________ _____ __ _ ____
+|_ _/ ___| ___ \ / __ \ / _(_) /__ \
+ | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
+ | | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
+ _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
+ \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
__/ |
|___/ ";
echo "\n".str_repeat('-',80)."\n";
@@ -95,6 +95,10 @@
die('This software can not be installed on a server wich runs ISPConfig 2.x.');
}
+if(is_dir('/usr/local/ispconfig')) {
+ die('ISPConfig 3 installation found. Please use update.php instead if install.php to update the installation.');
+}
+
//** Detect the installed applications
$inst->find_installed_apps();
--
Gitblit v1.9.1