Skip to content

Commit 0087708

Browse files
author
oliver
committed
1.) fixed a bug in the updater
2.) included missing configurations in config.inc.php.master 3.) disabled header & ini_set for shell actions in config.inc.php.master
1 parent cc3fb3d commit 0087708

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

install/tpl/config.inc.php.master

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,38 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2727
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
Header("Pragma: no-cache");
31-
Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
32-
Header("Content-Type: text/html");
30+
//** Web-only
31+
if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
3332

34-
ini_set('register_globals',0);
33+
Header("Pragma: no-cache");
34+
Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
35+
Header("Content-Type: text/html");
36+
37+
ini_set('register_globals',0);
38+
}
3539

3640
$conf["app_title"] = "ISPConfig";
3741
$conf["app_version"] = "3.0.0";
3842
$conf["modules_available"] = "admin,mail,sites,monitor,client,dns";
3943

44+
//** Key paramaters
45+
define('ISPC_APP_TITLE', 'ISPConfig');
46+
$conf['app_title'] = 'ISPConfig';
47+
define('ISPC_APP_VERSION', '3.0.0');
48+
$conf['app_version'] = '3.0.0';
49+
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns';
50+
51+
//** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
52+
define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../'));
53+
define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
54+
define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
55+
define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web');
56+
define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes');
57+
58+
define('ISPC_TEMP_PATH', ISPC_ROOT_PATH.'/temp');
59+
define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
60+
61+
4062
/*
4163
Server variables
4264
*/

install/update.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
ISPConfig 3 installer.
3333
*/
3434

35+
3536
// Include the library with the basic installer functions
3637
require_once('lib/install.lib.php');
3738

0 commit comments

Comments
 (0)