diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index c9f998a1585fe183f5e8e900e49eb21b6658dbc0..313e6b3298dc4a849421219cb389f8dfc854cfbd 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -27,16 +27,38 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -Header("Pragma: no-cache"); -Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate"); -Header("Content-Type: text/html"); +//** Web-only +if( !empty($_SERVER['DOCUMENT_ROOT']) ) { -ini_set('register_globals',0); + Header("Pragma: no-cache"); + Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate"); + Header("Content-Type: text/html"); + + ini_set('register_globals',0); +} $conf["app_title"] = "ISPConfig"; $conf["app_version"] = "3.0.0"; $conf["modules_available"] = "admin,mail,sites,monitor,client,dns"; +//** Key paramaters +define('ISPC_APP_TITLE', 'ISPConfig'); +$conf['app_title'] = 'ISPConfig'; +define('ISPC_APP_VERSION', '3.0.0'); +$conf['app_version'] = '3.0.0'; +$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns'; + +//** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes. +define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); +define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib'); +define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes'); +define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web'); +define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes'); + +define('ISPC_TEMP_PATH', ISPC_ROOT_PATH.'/temp'); +define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache'); + + /* Server variables */ diff --git a/install/update.php b/install/update.php index 57daca2c2cbd93e5a4f0526c8cbb1f4d3d13ad67..3159fe3207f618abdb7be43cfb25f7e34da6b6c4 100644 --- a/install/update.php +++ b/install/update.php @@ -32,6 +32,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ISPConfig 3 installer. */ + // Include the library with the basic installer functions require_once('lib/install.lib.php');