Project

General

Profile

« Previous | Next » 

Revision 749

Added by doc over 16 years ago

Removed hardcoded /admin folder strings from WB core files where possible

View differences:

upgrade-script.php
26 26
/** 
27 27
	PHP ROUTINES FOR THE UPGRADE SCRIPT
28 28
**/
29
@include_once('config.php');
30

  
29 31
// this function checks the basic configurations of an existing WB intallation
30 32
function status_msg($message, $class='check', $element='span') {
31 33
	// returns a status message
......
34 36

  
35 37
function check_baseline_configuration() {
36 38
	// check if config.php file exists and contains values
39
	global $database;
37 40
	status_msg('config.php: ');
38
	@include_once('config.php');
39
	if(defined('WB_PATH')) {
41
	if(defined('WB_PATH') && defined('ADMIN_PATH')) {
40 42
		status_msg('OK', 'ok');
41 43
	} else {
42 44
		// output error message and return error status
......
51 53
	// check if the WB 2.7 installation files were already uploaded via FTP
52 54
	status_msg(', WB 2.7 core files uploaded: ');
53 55
	@include_once(WB_PATH .'/framework/functions.php');
54
	@include_once(WB_PATH .'/admin/interface/version.php');
56
	@include_once(ADMIN_PATH .'/interface/version.php');
55 57
	if(defined('VERSION') && VERSION == '2.7'
56 58
		&& function_exists('get_variable_content') 
57 59
		&& file_exists(WB_PATH .'/modules/menu_link/languages/DE.php') 
58 60
		&& file_exists(WB_PATH .'/modules/output_filter/filter-routines.php') 
59 61
		&& file_exists(WB_PATH .'/modules/captcha_control/languages/DE.php')
60 62
		&& file_exists(WB_PATH .'/modules/jsadmin/jsadmin_backend_include.php')
61
		&& file_exists(WB_PATH .'/admin/admintools/tool.php')
62
		&& file_exists(WB_PATH .'/admin/interface/er_levels.php')) {
63
		&& file_exists(ADMIN_PATH .'/admintools/tool.php')
64
		&& file_exists(ADMIN_PATH .'/interface/er_levels.php')) {
63 65
		status_msg('OK','ok');
64 66
	} else {
65 67
		// output a warning and return error status
......
117 119

  
118 120
#container {
119 121
	width:85%;
120
	background: #9ACBF1 url(admin/interface/background.png) repeat-x;
122
	background: #9ACBF1 url(<?php echo ADMIN_URL;?>/interface/background.png) repeat-x;
121 123
	border:1px solid #000;
122 124
	color:#000;
123 125
	margin:2em auto;
......
155 157
</head>
156 158
<body>
157 159
<div id="container">
158
<img src="admin/interface/logo.png" alt="Website Baker Logo" />
160
<img src="<?php echo ADMIN_URL;?>/interface/logo.png" alt="Website Baker Logo" />
159 161

  
160 162
<h1>Website Baker Upgrade</h1>
161 163
<p>This script is for <strong>upgrading an existing v2.6.7</strong> installation to the latest Website Baker <strong>version 2.7</strong>. The upgrade script checks the configuration of your installed Website Baker system and alters the existing WB database to reflect the changes introduced with WB 2.7.</p>

Also available in: Unified diff