Commit 0087708f authored by oliver's avatar oliver
Browse files

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
parent cc3fb3d9
...@@ -27,16 +27,38 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ...@@ -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. EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
Header("Pragma: no-cache"); //** Web-only
Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate"); if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
Header("Content-Type: text/html");
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_title"] = "ISPConfig";
$conf["app_version"] = "3.0.0"; $conf["app_version"] = "3.0.0";
$conf["modules_available"] = "admin,mail,sites,monitor,client,dns"; $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 Server variables
*/ */
......
...@@ -32,6 +32,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -32,6 +32,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ISPConfig 3 installer. ISPConfig 3 installer.
*/ */
// Include the library with the basic installer functions // Include the library with the basic installer functions
require_once('lib/install.lib.php'); require_once('lib/install.lib.php');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment