Project

General

Profile

« Previous | Next » 

Revision 882

Added by Matthias almost 16 years ago

updated upgrade-script.php to add sec_anchor field to settings table

View differences:

upgrade-script.php
23 23

  
24 24
*/
25 25

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

  
31 28
// this function checks the basic configurations of an existing WB intallation
......
34 31
	echo '<'.$element .' class="' .$class .'">' .$message .'</' .$element.'>';
35 32
}
36 33

  
37
function check_baseline_configuration() {
38
	// check if config.php file exists and contains values
39
	global $database;
40
	status_msg('config.php: ');
41
	if(defined('WB_PATH') && defined('ADMIN_PATH')) {
42
		status_msg('OK', 'ok');
43
	} else {
44
		// output error message and return error status
45
		status_msg('FAILED', 'error');
46
		status_msg('<strong>Error:</strong><br />No valid config.php found in: "<em>'
47
			.dirname(__FILE__).'</em>"<br />Please check if this script is placed in the WB root directory '
48
			.'and check/correct the config.php file before proceeding.<br /><br />You can not proceed before this error is fixed!!!'
49
			, 'warning', 'div');
50
		return -1;
51
	}
52 34

  
53
	// check if the WB 2.7 installation files were already uploaded via FTP
54
	status_msg(', WB 2.7 core files uploaded: ');
55
	@include_once(WB_PATH .'/framework/functions.php');
56
	@include_once(ADMIN_PATH .'/interface/version.php');
57
	if(defined('VERSION') && VERSION == '2.7'
58
		&& function_exists('get_variable_content') 
59
		&& file_exists(WB_PATH .'/modules/menu_link/languages/DE.php') 
60
		&& file_exists(WB_PATH .'/modules/output_filter/filter-routines.php') 
61
		&& file_exists(WB_PATH .'/modules/captcha_control/languages/DE.php')
62
		&& file_exists(WB_PATH .'/modules/jsadmin/jsadmin_backend_include.php')
63
		&& file_exists(ADMIN_PATH .'/admintools/tool.php')
64
		&& file_exists(ADMIN_PATH .'/interface/er_levels.php')) {
65
		status_msg('OK','ok');
66
	} else {
67
		// output a warning and return error status
68
		status_msg('FAILED','error');
69
		status_msg('<strong>Error:</strong><br />Some of the Website Baker 2.7 core files were not found.'
70
			.'<br />Please upload all core files (except config.php and folder /install) contained in the WB 2.7 installation package first.'
71
			.'<br /><br />You can not proceed before this error is fixed!!!'
72
			, 'warning', 'div');
73
		return -1;
74
	}
75

  
76
	// check database connection (try to extract a single value which should always exist)
77
	$matches = '';
78
	status_msg(', Database connection: ');
79
	if(class_exists('database')) {
80
		$table = TABLE_PREFIX .'groups';
81
		//$result = $database->query("SELECT group_id FROM $table WHERE group_id = '1' LIMIT 1");
82
		$result = $database->query("SELECT name FROM $table WHERE group_id = '1' LIMIT 1");
83
		$matches = ($result->numRows() > 0) ? $result->numRows() : '';
84
	}
85
	if($matches == '1') {
86
		status_msg('OK', 'ok');
87
	} else {
88
		// output error message and return error status
89
		status_msg('FAILED', 'error');
90
		status_msg('<strong>Error:</strong><br />Unable to connect to your existing Website Baker database.'
91
			.'<br />Make sure that the database class is available and the connection data in the config.php file is correct '
92
			.'and your database is not corrupt.<br />To check if your database is corrupt, you can use a tool like '
93
			.'<a href="http://www.phpmyadmin.net/" target="_blank">phpMyAdmin</a>.'
94
			.'<br /><br />You can not proceed before this error is fixed!!!'
95
			, 'warning', 'div');
96
		return -1;
97
	}
98
	return 0;
99
}
100

  
101 35
?>
102

  
103 36
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
104 37
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
105 38
<head>
106
<title>Upgrade script from Website Baker v2.6.7 to Website Baker v2.7</title>
39
<title>Upgrade script</title>
107 40
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
108 41
<style type="text/css">
109 42
body {
......
112 45
	border:0;
113 46
	background: #EBF7FC;
114 47
	color:#000;
115
  font-family: 'Trebuchet MS', Verdana, Arial, Helvetica, Sans-Serif;
48
	font-family: 'Trebuchet MS', Verdana, Arial, Helvetica, Sans-Serif;
116 49
	font-size: small;
117 50
	height:101%;
118 51
}
......
160 93
<img src="<?php echo ADMIN_URL;?>/interface/logo.png" alt="Website Baker Logo" />
161 94

  
162 95
<h1>Website Baker Upgrade</h1>
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>
164 96

  
165 97
<?php
166
if(!isset($_POST['backup_confirmed'])) { 
167
?>
168
<h2>Step 1: Check existing installation</h2>
169
<p>Checking the configuration of your existing Website Baker installation:<br />
170
<?php
171
// check the basic Website Baker installation before proceeding
172
if(check_baseline_configuration() != 0) {
173
echo <<< EOT
174
<h3>Checklist before upgrading:</h3>
175
<p>To upgrade from an existing WB 2.6.7 version, please perform the following steps in advance:
176
<ol>
177
<li>Backup the entire <strong>/pages</strong> folder (including all subfolder and files) of your existing WB installation</li>
178
<li>Backup the entire <strong>Database</strong> of your existing WB installation (e.g. by the WB admin tool)</li>
179
<li>Download the WB 2.7 installation package from the <a href="http://download.websitebaker.org/" target="_blank">official project site</a></li>
180
<li>Upload all files contained in the WB 2.7 installation package (except config.php and the folder /install) via FTP over your existing installation</li>
181
<li>start this script by typing the URL into your browser</li>
182
</ol>
183
<strong class="error">Note: </strong>If you have an version lower than 2.6.7, you need to upgrade to 2.6.7 first!! Instructions can be found on the <a href="http://help.websitebaker.org/pages/en/basic-docu/installation/upgrade.php" target="_blank">Website Baker Help portal</a>.</p><p>&nbsp;</p>
184
EOT;
185
die;
186
}
187
// pre-checks passed, proceed
188
status_msg('<p>Congratulations: You have passed all the required pre-checks.', 'ok');
189
?>
190 98

  
191
<h2>Step 2: Create a backup of your existing data</h2>
192
<p>It is highly recommended to <strong>create a manual backup</strong> of the entire <strong>/pages folder</strong> and the <strong>MySQL database</strong> before proceeding.<br /><strong class="error">Note: </strong>The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.</p>
193

  
194
<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="POST">
195
<textarea cols="80" rows="5">DISCLAIMER: The Website Baker upgrade script is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. One needs to confirm that a manual backup of the /pages folder (including all files and subfolders contained in it) and backup of the entire Website Baker MySQL database was created before you can proceed.</textarea>
196
<br /><br /><input name="backup_confirmed" type="checkbox" value="confirmed" />&nbsp;I confirm that a manual backup of the /pages folder and the MySQL database was created.
197
<br /><br /><input name="send" type="submit" value="Start upgrade script" />
198
</form>
199
<br />
200

  
201
<?php
202
if(isset($_POST['send'])) {
203
	status_msg('<strong>Notice:</strong><br />You need to confirm that you have created a manual backup of the /pages directory and the MySQL database before you can proceed.', 'warning', 'div');
204
} 
205
?>
206
<br /><br />
207
<?php
208
} else {
209
/**
210
	THE WEBSITE BAKER UPGRADE SCRIPT STARTS HERE
211
**/
212 99
require_once('config.php');
213 100
require_once(WB_PATH.'/framework/functions.php');
214
?>
215
<h2>Step 3: Upgrading the existing Website Baker installation to WB 2.7</h2>
216
<p>will upgrade Website Baker 2.6.7 to version 2.7</p>
217
<?php
218 101

  
219 102
$OK   = '<span class="ok">OK</span>';
220 103
$FAIL = '<span class="error">FAILED</span>';
221 104

  
222

  
223 105
/**********************************************************
224
 *  - modules-based search
106
 *  - Adding field sec_anchor to settings table
225 107
 */
226
function db_add_search_key_value($key, $value) {
108
function db_add_key_value($key, $value) {
227 109
	global $database; global $OK; global $FAIL;
228
	$table = TABLE_PREFIX.'search';
110
	$table = TABLE_PREFIX.'settings';
229 111
	$query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1");
230 112
	if($query->numRows() > 0) {
231 113
		echo "$key: allready there. $OK.<br />";
232 114
		return true;
233 115
	} else {
234
		$database->query("INSERT INTO $table (name,value,extra) VALUES ('$key', '$value', '')");
116
		$database->query("INSERT INTO $table (name,value) VALUES ('$key', '$value')");
235 117
		echo (mysql_error()?mysql_error().'<br />':'');
236 118
		$query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1");
237 119
		if($query->numRows() > 0) {
......
243 125
		}
244 126
	}
245 127
}
246
function db_add_field($field, $table, $desc) {
247
	global $database; global $OK; global $FAIL;
248
	echo "<u>Adding field '$field' to table '$table'</u><br />";
249
	$table = TABLE_PREFIX.$table;
250
	$query = $database->query("DESCRIBE $table '$field'");
251
	if($query->numRows() == 0) { // add field
252
		$query = $database->query("ALTER TABLE $table ADD $field $desc");
253
		echo (mysql_error()?mysql_error().'<br />':'');
254
		$query = $database->query("DESCRIBE $table '$field'");
255
		echo (mysql_error()?mysql_error().'<br />':'');
256
		if($query->numRows() > 0) {
257
			echo "'$field' added. $OK.<br />";
258
		} else {
259
			echo "adding '$field' $FAIL!<br />";
260
		}
261
	} else {
262
		echo "'$field' allready there. $OK.<br />";
263
	}
264
}
265 128

  
266
echo "<br /><u>Adding module_order, max_excerpt and time_limit to search-table</u><br />";
267
// module_order - in which order to show the search-results
268
// max_excerpt - how many lines of excerpt to print per matching page
269
// time_limit - time-limit for searching per module
129
echo "<br />Adding field sec_anchor to settings table<br />";
270 130
$cfg = array(
271
	'module_order' => 'faqbaker,manual,wysiwyg',
272
	'max_excerpt' => '15',
273
	'time_limit' => '0'
131
	'sec_anchor' => 'wb_'
132
	
274 133
);
275 134
foreach($cfg as $key=>$value) {
276
	db_add_search_key_value($key, $value);
135
	db_add_key_value($key, $value);
277 136
}
278 137

  
279
echo "<br /><u>Adding some internal config-elements to search-table</u><br />";
280
// These are global config-elements which don't appear in settings-page. Change them in the database if needed.
281
// cfg_show_description - whether to show page-description on the results page (true/false), def: true
282
// cfg_search_description - whether to search in page-description (true/false), def: true [only used while searching title/link/description/keywords]
283
// cfg_search_keywords - whether to search in page-keywords (true/false), def: true [only used while searching title/link/description/keywords]
284
// cfg_enable_old_search - use old search-method, too (true/false), def: true [use old method as fallback]
285
// cfg_enable_flush - use "ob_flush();flush();" after every page on result page. Will speedup response of result page, but may break template
286
$cfg = array(
287
	'cfg_show_description' => 'true',
288
	'cfg_search_description' => 'true',
289
	'cfg_search_keywords' => 'true',
290
	'cfg_enable_old_search' => 'true',
291
	'cfg_enable_flush' => 'false'
292
);
293
foreach($cfg as $key=>$value) {
294
	db_add_search_key_value($key, $value);
295
}
296

  
297
echo "<br /><u>Changing results_loop in search-table</u><br />";
298
// adding [EXCERPT]
299

  
300
$query = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'results_loop' LIMIT 1");
301
if($query->numRows() > 0) {
302
	$fetch_results_loop = $query->fetchRow();
303
	$string = $fetch_results_loop['value'];
304
	if(preg_match("/\[EXCERPT\]/", $string)) {
305
		echo "[EXCERPT] is allready there. $OK.<br />";
306
	} else {
307
		$string = preg_replace("/10px;\">\[DESCRIPTION\]/", "5px;\">[DESCRIPTION]", $string);
308
		$string .= "<tr><td colspan=\"2\" style=\"text-align: justify; padding-bottom: 10px;\">[EXCERPT]</td></tr>";
309
		$string = addslashes($string);
310
		$database->query("UPDATE ".TABLE_PREFIX."search SET name='results_loop',value='".$string."',extra='' WHERE name = 'results_loop' LIMIT 1");
311
		echo (mysql_error()?mysql_error().'<br />':'');
312
		$query = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'results_loop' LIMIT 1");
313
		if($query->numRows() > 0) {
314
			$fetch_results_loop = $query->fetchRow();
315
			$string = $fetch_results_loop['value'];
316
			if(preg_match("/\[EXCERPT\]/", $string)) {
317
				echo "[EXCERPT] added. $OK.<br />";
318
			} else {
319
				echo "adding [EXCERPT] $FAIL!<br />";
320
			}
321
		}
322
	}
323
}
324

  
325
echo "<br /><u>Changing \"Header:\" in search-table</u><br />";
326
// adding [SEARCH_PATH]
327

  
328
$query = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'header' LIMIT 1");
329
if($query->numRows() > 0) {
330
	$fetch_header = $query->fetchRow();
331
	$string = $fetch_header['value'];
332
	if(preg_match("/\[SEARCH_PATH\]/", $string)) {
333
		echo "[SEARCH_PATH] is allready there. $OK.<br />";
334
	} else {
335
		$string = preg_replace("/<input type=\"text\" name=\"string\" value=\"\[SEARCH_STRING\]\" style=\"width: 100%;\" \/>/", "<input type=\"hidden\" name=\"search_path\" value=\"[SEARCH_PATH]\" /><input type=\"text\" name=\"string\" value=\"[SEARCH_STRING]\" style=\"width: 100%;\" />", $string);
336
		$string = addslashes($string);
337
		$database->query("UPDATE ".TABLE_PREFIX."search SET name='header',value='".$string."',extra='' WHERE name = 'header' LIMIT 1");
338
		echo (mysql_error()?mysql_error().'<br />':'');
339
		$query = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'header' LIMIT 1");
340
		if($query->numRows() > 0) {
341
			$fetch_header = $query->fetchRow();
342
			$string = $fetch_header['value'];
343
			if(preg_match("/\[SEARCH_PATH\]/", $string)) {
344
				echo "[SEARCH_PATH] added. $OK.<br />";
345
			} else {
346
				echo "adding [SEARCH_PATH] $FAIL!<br />";
347
			}
348
		}
349
	}
350
}
351

  
352

  
353 138
/**********************************************************
354
 *  - publish-by-date
355
 */
356
// Add fields "publ_start" and "publ_end" to table "sections"
357
// check if fields are present
358
db_add_field('publ_start', 'sections', "INT NOT NULL DEFAULT '0'");
359
db_add_field('publ_end', 'sections', "INT NOT NULL DEFAULT '0'");
360

  
361

  
362
/**********************************************************
363
 *  - core-module menu_link
364
 */
365
// create table
366
$table = TABLE_PREFIX ."mod_menu_link";
367
$database->query("DROP TABLE IF EXISTS `$table`");
368
$database->query("
369
	CREATE TABLE `$table` (
370
		`section_id` INT(11) NOT NULL DEFAULT '0',
371
		`page_id` INT(11) NOT NULL DEFAULT '0',
372
		`target_page_id` INT(11) NOT NULL DEFAULT '0',
373
		`anchor` VARCHAR(255) NOT NULL DEFAULT '0' ,
374
		`extern` VARCHAR(255) NOT NULL DEFAULT '' ,
375
		PRIMARY KEY (`section_id`)
376
	)
377
");
378
// fetch all menu_link-pages in $pages
379
$pages = array();
380
$table_p = TABLE_PREFIX.'pages';
381
$table_s = TABLE_PREFIX.'sections';
382
$table_mm = TABLE_PREFIX ."mod_menu_link";
383

  
384
$query_page = $database->query("SELECT p.*, s.section_id FROM $table_p AS p, $table_s AS s WHERE p.page_id=s.page_id AND s.module = 'menu_link'");
385
if($query_page->numRows() > 0) {
386
	while($page = $query_page->fetchRow()) {
387
		$pages[$page['page_id']]['page_details'] = $page;
388
	}
389
}
390
if($pages!=array())
391
	echo "<br /><u>Convert menu_links</u><br />";
392

  
393
// get all related files with content from pages/ in $pages, too
394
function list_files_dirs($dir, $depth=true, $files=array(), $dirs=array()) {
395
	$dh=opendir($dir);
396
	while(($file = readdir($dh)) !== false) {
397
		if($file == '.' || $file == '..') {
398
			continue;
399
		}
400
		if(is_dir($dir.'/'.$file)) {
401
			if($depth) {
402
				$dirs[] = $dir.'/'.$file;
403
				list($files, $dirs) = list_files_dirs($dir.'/'.$file, $depth, $files, $dirs);
404
			}
405
		} else {
406
			$newfile = $dir.'/'.$file;
407
			if(filesize($newfile) <= 100)
408
				$files[] = $newfile;
409
		}
410
	}
411
	closedir($dh);
412
	return(array($files, $dirs));
413
}
414
list($files, $dirs) = list_files_dirs(WB_PATH.PAGES_DIRECTORY);
415
foreach($files as $file) {
416
	if(($content = implode('', file($file))) !== FALSE) {
417
		if(preg_match('/\$page_id = (\d+)/', $content, $matches)) {
418
			if(array_key_exists($matches[1], $pages)) {
419
				$pages[$matches[1]]['file_content'] = $content;
420
				$pages[$matches[1]]['filename'] = $file;
421
			}
422
		}
423
	}
424
}
425
unset($files); unset($dirs);
426
// try to convert old menu_links to new ones
427
foreach($pages as $p) {
428
	$page = $p['page_details'];
429
	$file_content = $p['file_content'];
430
	$filename = $p['filename'];
431
	$link = $p['page_details']['link'];
432
	$parent_pid = $p['page_details']['parent'];
433
	$page_id = $p['page_details']['page_id'];
434
	$section_id = $p['page_details']['section_id'];
435
	$menu_title = $p['page_details']['menu_title'];
436

  
437
	// calculate link from wb_pages.parent and menu_title
438
	$cur_link = '';
439
	if($parent_pid != '0' && $query_link = $database->query("SELECT link FROM $table_p WHERE page_id = '$parent_pid'")) {
440
		$res = $query_link->fetchRow();
441
		$cur_link .= $res['link'];
442
	}
443
	$cur_link .= '/'.page_filename($menu_title);
444
echo "found: $cur_link<br />";
445
	$database->query("UPDATE $table_p SET link = '$cur_link' WHERE page_id = '$page_id'");
446
	echo (mysql_error()?'mySQL: '.mysql_error().'<br />':'');
447
	
448
	$new_filenames[$page_id]['file'] = WB_PATH.PAGES_DIRECTORY.$cur_link.PAGE_EXTENSION;
449
	$new_filenames[$page_id]['link'] = $cur_link;
450
	$new_filenames[$page_id]['menu'] = $menu_title;
451

  
452
	// delete old access files in pages
453
	if(file_exists($filename)) {
454
		if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) {
455
			echo "Cannot delete access file in pages/ - permission denied ($FAIL)<br />";
456
		} else {
457
			unlink($filename);
458
		}
459
	}
460
	
461
	// make entry in wb_mod_menu_link
462
	if($query_pid = $database->query("SELECT page_id FROM $table_p WHERE page_id != '$page_id' AND link = '$link'")) {
463
		$res = $query_pid->fetchRow();
464
		$target_page_id = $res['page_id'];
465
		$extern = '';
466
		if(strpos($link, '://') !== FALSE || strpos($link, 'mailto:') !== FALSE) {
467
			$target_page_id=-1;
468
			$extern=addslashes($link);
469
		}
470
		$database->query("INSERT INTO $table_mm (page_id, section_id, target_page_id, anchor, extern) VALUES ('$page_id', '$section_id', '$target_page_id', '0', '$extern')");
471
		echo (mysql_error()?'mySQL: '.mysql_error().'<br />':'');
472
	}
473
}
474
// create new access files in pages/; make directories as needed
475
foreach($pages as $p) {
476
	$page_id = $p['page_details']['page_id'];
477
	$filename = $new_filenames[$page_id]['file'];
478
	$menu_title = $new_filenames[$page_id]['menu'];
479
	$link = $new_filenames[$page_id]['link'];
480
	$content = $p['file_content'];
481
	$level = $p['page_details']['level'];
482
	$depth = '';
483
	for($i=0; $i<=$level; $i++)
484
		$depth .= '../';
485
	$content = preg_replace('#((../)+)config\.php#', "{$depth}config.php", $content);
486
	while(file_exists($filename)) {
487
		echo "Cannot create '$filename' - file exist. Renamed to: ";
488
		$menu_title .= '_';
489
		$link .= '_';
490
		$filename = WB_PATH.PAGES_DIRECTORY.$link.PAGE_EXTENSION;
491
		echo "$filename<br />";
492
		$database->query("UPDATE $table_p SET link='$link', menu_title='$menu_title' WHERE page_id = '$page_id'");
493
		echo mysql_error()?'mySQL: '.mysql_error().'<br />':'';
494
	}
495
	// check if we need to create a subdir somewhere
496
	$dirs = array();
497
	while(dirname($link) != '/' && dirname($link) != '.' && dirname($link) != '\\') {
498
		$link = dirname($link);
499
		$dirs[] = WB_PATH.PAGES_DIRECTORY.$link;
500
	}
501
	foreach(array_reverse($dirs) as $dir) {
502
		if(!file_exists($dir)) {
503
			@mkdir($dir, OCTAL_DIR_MODE);
504
		}
505
	}
506
	// create new file in pages/
507
	if($handle=fopen($filename, "wb")) {
508
		if(!fwrite($handle, $content)) {
509
			echo "Cannot write to $filename - ($FAIL)<br />";
510
		}
511
		fclose($handle);
512
	} else {
513
		echo "Cannot create $filename - ($FAIL)<br />";
514
	}
515
	
516
}
517

  
518
/**********************************************************
519
 *  - asp - Advanced Spam Protection
520
 */
521
echo "<br /><u>Adding table mod_captcha_control</u><br />";
522
$table = TABLE_PREFIX.'mod_captcha_control';
523
$database->query("DROP TABLE IF EXISTS `$table`");
524
$database->query("CREATE TABLE `$table` (
525
	`enabled_captcha` VARCHAR(1) NOT NULL DEFAULT '1',
526
	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '0',
527
	`captcha_type` VARCHAR(255) NOT NULL DEFAULT 'calc_text',
528
	`asp_session_min_age` INT(11) NOT NULL DEFAULT '20',
529
	`asp_view_min_age` INT(11) NOT NULL DEFAULT '10',
530
	`asp_input_min_age` INT(11) NOT NULL DEFAULT '5',
531
	`ct_text` LONGTEXT NOT NULL DEFAULT ''
532
	)"
533
);
534
$database->query("
535
	INSERT INTO `$table`
536
		(`enabled_captcha`, `enabled_asp`, `captcha_type`)
537
	VALUES
538
		('1', '1', 'calc_text')
539
");
540

  
541

  
542
/**********************************************************
543
 *  - multi-group
544
 */
545
db_add_field('groups_id', 'users', "VARCHAR( 255 ) NOT NULL DEFAULT '0' AFTER group_id");
546
$table = TABLE_PREFIX.'users';
547
if($query_group = $database->query("SELECT user_id,group_id,groups_id FROM $table")) {
548
	while($group = $query_group->fetchRow()) {
549
		if($group['groups_id'] == '0') {
550
			if($database->query("UPDATE $table SET groups_id = group_id WHERE user_id = {$group['user_id']}")) {
551
				echo 'groups_id updated successfully<br>';
552
			}
553
			echo mysql_error().'<br />';
554
		}
555
	}
556
}
557

  
558

  
559
/**********************************************************
560
 *  -Javascript Admin
561
 */
562
echo "<br /><u>Adding table mod_jsadmin</u><br />";
563
$table = TABLE_PREFIX ."mod_jsadmin";
564
$database->query("DROP TABLE IF EXISTS `$table`");
565

  
566
$database->query("
567
	CREATE TABLE `$table` (
568
    `id` INT(11) NOT NULL DEFAULT '0',
569
		`name` VARCHAR(255) NOT NULL DEFAULT '0',
570
		`value` INT(11) NOT NULL DEFAULT '0',
571
   	PRIMARY KEY (`id`)
572
	)
573
");
574

  
575
global $database;
576
echo "Insert default value for mod_jsadmin_persist_order: ";
577
echo ($database->query("INSERT INTO ".$table." (id,name,value) VALUES ('1','mod_jsadmin_persist_order','0')")) ? " $OK<br />" : " $FAIL<br />"; 
578
echo "Insert default value for mod_jsadmin_ajax_order_pages: ";
579
echo ($database->query("INSERT INTO ".$table." (id,name,value) VALUES ('2','mod_jsadmin_ajax_order_pages','0')")) ? " $OK<br />" : " $FAIL<br />"; 
580
echo "Insert default value for mod_jsadmin_ajax_order_sections: ";
581
echo ($database->query("INSERT INTO ".$table." (id,name,value) VALUES ('3','mod_jsadmin_ajax_order_sections','0')")) ? " $OK<br />" : " $FAIL<br />"; 
582

  
583
/**********************************************************
584
 *  - Output Filter
585
 */
586
echo "<br /><u>Adding table mod_outputfilter</u><br />Status: ";
587
$table = TABLE_PREFIX .'mod_output_filter';
588
$database->query("DROP TABLE IF EXISTS `$table`");
589

  
590
$database->query("CREATE TABLE `$table` (
591
	`email_filter` VARCHAR(1) NOT NULL DEFAULT '0',
592
	`mailto_filter` VARCHAR(1) NOT NULL DEFAULT '0',
593
	`at_replacement` VARCHAR(255) NOT NULL DEFAULT '(at)',
594
	`dot_replacement` VARCHAR(255) NOT NULL DEFAULT '(dot)'
595
	)"
596
);
597

  
598
// add default values to the module table
599
echo ($database->query("INSERT INTO ".TABLE_PREFIX
600
	."mod_output_filter (email_filter, mailto_filter, at_replacement, dot_replacement) VALUES ('0', '0', '(at)', '(dot)')")) ? " $OK<br />" : " $FAIL<br />"; 
601
	
602

  
603
/**********************************************************
604
 *  - Form Modul
605
 */
606
echo '<br />';
607
db_add_field('success_email_subject', 'mod_form_settings', "VARCHAR(255) NOT NULL AFTER `email_subject`");
608
echo '<br />';
609
db_add_field('success_email_text', 'mod_form_settings', "TEXT NOT NULL AFTER `email_subject`");
610
echo '<br />';
611
db_add_field('success_email_from', 'mod_form_settings', "VARCHAR(255) NOT NULL AFTER `email_subject`");
612
echo '<br />';
613
db_add_field('success_email_to', 'mod_form_settings', "TEXT NOT NULL AFTER `email_subject`");
614
echo '<br />';
615
db_add_field('success_page', 'mod_form_settings', "TEXT NOT NULL AFTER `email_subject`");
616
echo '<br />';
617
db_add_field('email_fromname', 'mod_form_settings', "VARCHAR( 255 ) NOT NULL AFTER email_from");
618
echo '<br />';
619
db_add_field('success_email_fromname', 'mod_form_settings', "VARCHAR( 255 ) NOT NULL AFTER success_email_from");
620

  
621
echo "<br /><b>Deleting field success_message from table mod_form_settings</b><br />";
622

  
623
if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` DROP `success_message`")) {
624
	echo 'Database field success_message droped successfully<br>';
625
}
626
echo mysql_error().'<br />';
627

  
628
// These are the default setting
629
$success_page = 'none';
630
$success_email_to = '';
631
$success_email_text = 'Thank you for submitting your form on '.WEBSITE_TITLE;
632
$success_email_text = addslashes($success_email_text);
633
$success_email_subject = 'You have submitted a form';
634

  
635
// Insert default settings into database
636
$query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings where section_id != 0 and page_id != 0");
637
while($result = $query_dates->fetchRow()) {
638
	
639
	echo "<B>Add default settings data to database for form section_id= ".$result['section_id']."</b><BR>";
640
	$section_id = $result['section_id'];
641

  
642
	if($database->query("UPDATE `".TABLE_PREFIX."mod_form_settings` SET `success_page` = '$success_page' WHERE `section_id` = $section_id")) {
643
		echo 'Database data success_page added successfully<br>';
644
	}
645
	echo mysql_error().'<br />';
646
	
647
	if($database->query("UPDATE `".TABLE_PREFIX."mod_form_settings` SET `success_email_to` = '$success_email_to' WHERE `section_id` = $section_id")) {
648
		echo 'Database data success_email_to added successfully<br>';
649
	}
650
	echo mysql_error().'<br />';
651
	
652
	if($database->query("UPDATE `".TABLE_PREFIX."mod_form_settings` SET `success_email_text` = '$success_email_text' WHERE `section_id` = $section_id")) {
653
		echo 'Database data success_email_text added successfully<br>';
654
	}
655
	echo mysql_error().'<br />';
656
	
657
	if($database->query("UPDATE `".TABLE_PREFIX."mod_form_settings` SET `success_email_subject` = '$success_email_subject' WHERE `section_id` = $section_id")) {
658
		echo 'Database data success_email_subject added successfully<br>';
659
	}
660
	echo mysql_error().'<br />';
661
	
662
}
663

  
664
// copy field email_to to success_email_from
665
$query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings where section_id != 0 and page_id != 0");
666
while($result = $query_dates->fetchRow()) {
667
	
668
	echo "<B>Copying field email_to to success_email_from for form section_id= ".$result['section_id']."</B><BR>";
669
	$section_id = $result['section_id'];
670

  
671
	$success_email_from = $result['email_to'];
672
	if($database->query("UPDATE `".TABLE_PREFIX."mod_form_settings` SET `success_email_from` = '$success_email_from' WHERE `section_id` = $section_id")) {
673
		echo 'Copyied field email_to to success_email_from successfully<br>';
674
	}
675
	echo mysql_error().'<br />';
676
}
677

  
678

  
679
/**********************************************************
680
 *  - News Modul
681
 */
682
db_add_field('published_when', 'mod_news_posts', "INT NOT NULL AFTER `commenting`");
683
db_add_field('published_until', 'mod_news_posts', "INT NOT NULL AFTER `published_when`");
684

  
685
// These are the default setting
686
$header = '<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"98%\">';
687
$post_loop = '<tr class=\"post_top\">
688
<td class=\"post_title\"><a href=\"[LINK]\">[TITLE]</a></td>
689
<td class=\"post_date\">[MODI_TIME], [MODI_DATE]</td>
690
</tr>
691
<tr>
692
<td class=\"post_short\" colspan=\"2\">
693
[SHORT] 
694
<a href=\"[LINK]\">[TEXT_READ_MORE]</a>
695
</td>
696
</tr>';
697
$post_header = addslashes('<table cellpadding="0" cellspacing="0" border="0" width="100%">
698
<tr>
699
<td height="30"><h1>[TITLE]</h1></td>
700
<td rowspan="3" style="display: [DISPLAY_IMAGE]"><img src="[GROUP_IMAGE]" alt="[GROUP_TITLE]" /></td>
701
</tr>
702
<tr>
703
<td valign="top"><b>Posted by [DISPLAY_NAME] ([USERNAME]) on [PUBL_DATE]</b></td>
704
</tr>
705
<tr style="display: [DISPLAY_GROUP]">
706
<td valign="top"><a href="[BACK]">[PAGE_TITLE]</a> >> <a href="[BACK]?g=[GROUP_ID]">[GROUP_TITLE]</a></td>
707
</tr>
708
</table>
709
<p style="text-align: justify;">');
710
$post_footer = '</p><p>Last changed: [MODI_DATE] at [MODI_TIME]</p>
711
<a href=\"[BACK]\">Back</a>';
712
$comments_header = addslashes('<br /><br />
713
<h2>Comments</h2>
714
<table cellpadding="2" cellspacing="0" border="0" width="98%">');
715

  
716
// Insert default settings into database
717
$query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0");
718
while($result = $query_dates->fetchRow()) {
719
	
720
	echo "<B>Add default settings data to database for news section_id= ".$result['section_id']."</b><BR>";
721
	$section_id = $result['section_id'];
722

  
723
	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `header` = '$header' WHERE `section_id` = $section_id")) {
724
		echo 'Database data header added successfully<br>';
725
	}
726
	echo mysql_error().'<br />';
727
	
728
	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_loop` = '$post_loop' WHERE `section_id` = $section_id")) {
729
		echo 'Database data post_loop added successfully<br>';
730
	}
731
	echo mysql_error().'<br />';
732
	
733
	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_header` = '$post_header' WHERE `section_id` = $section_id")) {
734
		echo 'Database data post_header added successfully<br>';
735
	}
736
	echo mysql_error().'<br />';
737
	
738
	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_footer` = '$post_footer' WHERE `section_id` = $section_id")) {
739
		echo 'Database data post_footer added successfully<br>';
740
	}
741
	echo mysql_error().'<br />';
742
	
743
	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_header` = '$comments_header' WHERE `section_id` = $section_id")) {
744
		echo 'Database data comments_header added successfully<br>';
745
	}
746
	echo mysql_error().'<br />';
747

  
748
}
749

  
750
// MIGRATING FIELD DATES to POSTED_WHEN
751
$query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts where section_id != 0 and page_id != 0");
752
if($query_dates->numRows() > 0) {
753
	echo "<B>Copying field posted_when value to published_when</B><BR>";
754
}
755
while($result = $query_dates->fetchRow()) {
756
	$pid = $result['post_id'];
757
	$NEW_DATE = $result['posted_when'];
758
	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_posts` SET `published_when` = '$NEW_DATE' WHERE `post_id` = $pid")) {
759
		echo 'Copying posted_when value to published_when successfully<br>';
760
	}
761
	echo mysql_error().'<br />';
762
}
763

  
764
/**********************************************************
765
 *  - Alter the WYSIWYG editor (longtext, default FCK)
766
 */
767
echo "<br /><u>Alter WYSIWYG editor settings</u><br />Alter field content from text to longtext: ";
768
echo ($database->query("ALTER TABLE ".TABLE_PREFIX."mod_wysiwyg MODIFY content LONGTEXT NOT NULL")) ?" $OK<br />" : " $FAIL<br />";
769
if(file_exists(WB_PATH .'/modules/fckeditor/include.php')) {
770
	echo "Make FCKEditor the new default editor: ";
771
	echo ($database->query("UPDATE ".TABLE_PREFIX."settings SET value='fckeditor' WHERE name='wysiwyg_editor'")) ?" $OK<br />" : " $FAIL<br />";
772
}
773

  
774
/**********************************************************
775
 *  - Add Admintools to Administrator group
776
 */
777
echo "<br /><u>Add Admintools to Adminsitrator group</u><br />Status: ";
778
$full_system_permissions = 'pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools';
779
echo ($database->query("UPDATE `".TABLE_PREFIX."groups` SET `system_permissions` = '$full_system_permissions' WHERE `name` = 'Administrators'")) ? " $OK<br />" : " $FAIL<br />";
780

  
781
/**********************************************************
782
 *  - Add Mailer Settings to settings table
783
 */
784
echo "<br /><u>Add Mailer Settings to settings table</u><br />Status: ";
785
//delete rows to prevent double entries
786
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_routine'");
787
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'server_email'");
788
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_default_sendername'");
789
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_smtp_host'");
790
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_smtp_auth'");
791
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_smtp_username'");
792
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_smtp_password'");
793
//add new rows with default values
794
$wbmailer_smtp_host = (defined('WBMAILER_SMTP_HOST')) ? WBMAILER_SMTP_HOST : '';
795
$wbmailer_routine = ($wbmailer_smtp_host == '') ? 'phpmail' : 'smtp';
796
$settings_rows=	"INSERT INTO `".TABLE_PREFIX."settings` "
797
." (name, value) VALUES "
798
." ('wbmailer_routine', '$wbmailer_routine'),"
799
." ('server_email', 'admin@yourdomain.com'),"		// avoid that mail provider (e.g. mail.com) reject mails like yourname@mail.com
800
." ('wbmailer_default_sendername', 'WB Mailer'),"
801
." ('wbmailer_smtp_host', '$wbmailer_smtp_host'),"
802
." ('wbmailer_smtp_auth', ''),"
803
." ('wbmailer_smtp_username', ''),"
804
." ('wbmailer_smtp_password', '')";
805
echo ($database->query($settings_rows)) ? " $OK<br />" : " $FAIL<br />";
806

  
807
/**********************************************************
808
 *  - Set Version to WB 2.7
809
 */
810
echo "<br /><u>Update database version number to 2.7</u><br />Status: ";
811
$version = '2.7';
812
echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value` = '$version' WHERE `name` = 'wb_version'")) ? " $OK<br />" : " $FAIL<br />";
813

  
814
/**********************************************************
815
 *  - Reload all addons
816
 */
817

  
818
//delete modules
819
$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'");
820
// Load all modules
821
if($handle = opendir(WB_PATH.'/modules/')) {
822
	while(false !== ($file = readdir($handle))) {
823
		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') {
824
			load_module(WB_PATH.'/modules/'.$file);
825
		}
826
	}
827
	closedir($handle);
828
}
829
echo '<br />Modules reloaded<br />';
830

  
831
//delete templates		
832
$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
833
// Load all templates
834
if($handle = opendir(WB_PATH.'/templates/')) {
835
	while(false !== ($file = readdir($handle))) {
836
		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') {
837
			load_template(WB_PATH.'/templates/'.$file);
838
		}
839
	}
840
	closedir($handle);
841
}
842
echo '<br />Templates reloaded<br />';
843

  
844
//delete languages
845
$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'");
846
// Load all languages
847
if($handle = opendir(WB_PATH.'/languages/')) {
848
	while(false !== ($file = readdir($handle))) {
849
		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') {
850
			load_language(WB_PATH.'/languages/'.$file);
851
		}
852
	}
853
	closedir($handle);
854
}
855
echo '<br />Languages reloaded<br />';
856

  
857
/**********************************************************
858 139
 *  - End of upgrade script
859 140
 */
860
$config_msg = ($wbmailer_smtp_host != '') ? '<br /><br />Note: Please remove the line: <strong>define(\'WBMAILER_SMTP_HOST\', \''.$wbmailer_smtp_host.'\');</strong> from file <strong>config.php</strong> before proceeding!' : '';
861 141
echo '<p style="font-size:120%;"><strong>Congratulations: The upgrade script is finished ...</strong></p>';
862
status_msg('<strong>Warning:</strong><br />Please delete the file <strong>upgrade-script.php</strong> via FTP before proceeding.<br />If you do not delete this script from your server, others can delete/overwritte database settings by executing this script again. <br /><br />If you are using Admin tools, please update them with the latest version on the WB Add-ons repository to avoid problems.'.$config_msg, 'warning', 'div');
142
status_msg('<strong>Warning:</strong><br />Please delete the file <strong>upgrade-script.php</strong> via FTP before proceeding.', 'warning', 'div');
863 143
// show buttons to go to the backend or frontend
864 144
echo '<br />';
865 145
if(defined('WB_URL')) {
......
873 153
	echo '</form>';
874 154
}
875 155
echo '<p>&nbsp;</p>';
876
}
156

  
877 157
?>
158
	
878 159
</div>
879 160
</body>
880 161
</html>

Also available in: Unified diff