Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-06 82b723df86594a89fb53607981488319e39b1b92

 install/update.php

@@ -66,6 +66,9 @@
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));

//** Include the templating lib
require_once 'lib/classes/tpl.inc.php';

//** Check for ISPConfig 2.x versions
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
   die('This software cannot be installed on a server wich runs ISPConfig 2.x.');