Revision 1292
Added by Dietmar over 14 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
12 | 12 |
|
13 | 13 |
------------------------------------- 2.8.1 ------------------------------------- |
14 | 14 |
19-Feb-2010 Dietmar Woellbrink (Luisehahne) |
15 |
! insert $wb->preprocess($output), preprocess no longer needed in modules |
|
16 |
! little modifaction in upgrade-script.php in function check_wb_tables |
|
17 |
! updated module wysiwyg, set to module version 2.8 |
|
18 |
19-Feb-2010 Dietmar Woellbrink (Luisehahne) |
|
15 | 19 |
! recoded function extract_permission in /framework/functions.php |
16 | 20 |
! change URL_HELP to http://www.websitebaker2.org/ in /framework/class.admin.php |
17 | 21 |
! recoded function preprocess in /framework/class.frontend.php |
branches/2.8.x/wb/upgrade-script.php | ||
---|---|---|
76 | 76 |
function check_wb_tables() |
77 | 77 |
{ |
78 | 78 |
global $database,$table_list; |
79 |
$get_result = $database->query( "SHOW TABLES FROM ".DB_NAME); |
|
79 |
|
|
80 |
// if prefix inludes '_' or '%' |
|
81 |
$search_for = addcslashes ( TABLE_PREFIX, '%_' ); |
|
82 |
$get_result = $database->query( 'SHOW TABLES LIKE "'.$search_for.'%"'); |
|
83 |
|
|
84 |
// $get_result = $database->query( "SHOW TABLES FROM ".DB_NAME); |
|
80 | 85 |
$all_tables = array(); |
81 | 86 |
if($get_result->numRows() > 0) |
82 | 87 |
{ |
... | ... | |
288 | 293 |
else |
289 | 294 |
{ |
290 | 295 |
status_msg('<strong>WARNING:</strong><br />can\'t run Upgrade, missing tables', 'warning', 'div'); |
291 |
echo '<h4>Install missing tables, you can install them in backend->addons->modules->advanced. Then again run upgrade-script.php</h4>';
|
|
296 |
echo '<h4>Missing required tables. You can install them in backend->addons->modules->advanced. Then again run upgrade-script.php</h4>';
|
|
292 | 297 |
$result = array_diff ( $table_list, $all_tables ); |
293 |
echo '<h4 class="warning">'; |
|
298 |
echo '<h4 class="warning"><br />';
|
|
294 | 299 |
while ( list ( $key, $val ) = each ( $result ) ) |
295 | 300 |
{ |
296 | 301 |
echo TABLE_PREFIX.$val.' '.$FAIL.'<br>'; |
297 | 302 |
} |
298 |
echo '</h4>'; |
|
303 |
echo '<br /></h4>';
|
|
299 | 304 |
echo '<br /><form action="'. $_SERVER['PHP_SELF'] .'">'; |
300 | 305 |
echo '<input type="submit" value="kick me back" style="float:left;" />'; |
301 | 306 |
echo '</form>'; |
branches/2.8.x/wb/admin/interface/version.php | ||
---|---|---|
52 | 52 |
|
53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.x'); |
55 |
if(!defined('REVISION')) define('REVISION', '1291');
|
|
55 |
if(!defined('REVISION')) define('REVISION', '1292');
|
|
56 | 56 |
|
57 | 57 |
?> |
branches/2.8.x/wb/index.php | ||
---|---|---|
1 |
<?php |
|
2 |
|
|
3 |
// $Id$ |
|
4 |
|
|
5 |
/* |
|
6 |
|
|
7 |
Website Baker Project <http://www.websitebaker.org/> |
|
8 |
Copyright (C) 2004-2009, Ryan Djurovich |
|
9 |
|
|
10 |
Website Baker is free software; you can redistribute it and/or modify |
|
11 |
it under the terms of the GNU General Public License as published by |
|
12 |
the Free Software Foundation; either version 2 of the License, or |
|
13 |
(at your option) any later version. |
|
14 |
|
|
15 |
Website Baker is distributed in the hope that it will be useful, |
|
16 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
17 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
18 |
GNU General Public License for more details. |
|
19 |
|
|
20 |
You should have received a copy of the GNU General Public License |
|
21 |
along with Website Baker; if not, write to the Free Software |
|
22 |
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
23 |
|
|
24 |
*/ |
|
25 |
|
|
26 |
$starttime = array_sum(explode(" ",microtime())); |
|
27 |
|
|
28 |
// Include config file |
|
29 |
require_once(dirname(__FILE__).'/config.php'); |
|
30 |
|
|
31 |
// Check if the config file has been set-up |
|
32 |
if(!defined('WB_PATH')) { |
|
33 |
header("Location: install/index.php"); |
|
34 |
exit(0); |
|
35 |
} |
|
36 |
|
|
37 |
require_once(WB_PATH.'/framework/class.frontend.php'); |
|
38 |
// Create new frontend object |
|
39 |
$wb = new frontend(); |
|
40 |
|
|
41 |
// Figure out which page to display |
|
42 |
// Stop processing if intro page was shown |
|
43 |
$wb->page_select() or die(); |
|
44 |
|
|
45 |
// Collect info about the currently viewed page |
|
46 |
// and check permissions |
|
47 |
$wb->get_page_details(); |
|
48 |
|
|
49 |
// Collect general website settings |
|
50 |
$wb->get_website_settings(); |
|
51 |
|
|
52 |
// Load functions available to templates, modules and code sections |
|
53 |
// also, set some aliases for backward compatibility |
|
54 |
require(WB_PATH.'/framework/frontend.functions.php'); |
|
55 |
|
|
56 |
// redirect menu-link |
|
57 |
$this_page_id = PAGE_ID; |
|
58 |
if(version_compare(phpversion(), '4.3', '>=')) $php43 = TRUE; else $php43 = FALSE; |
|
59 |
$query_this_module = $database->query("SELECT module, block FROM ".TABLE_PREFIX."sections WHERE page_id = '$this_page_id' AND module = 'menu_link'"); |
|
60 |
if($query_this_module->numRows() == 1) { // This is a menu_link. Get link of target-page and redirect |
|
61 |
// get target_page_id |
|
62 |
$table = TABLE_PREFIX.'mod_menu_link'; |
|
63 |
$query_tpid = $database->query("SELECT * FROM $table WHERE page_id = '$this_page_id'"); |
|
64 |
if($query_tpid->numRows() == 1) { |
|
65 |
$res=$query_tpid->fetchRow(); |
|
66 |
$target_page_id = $res['target_page_id']; |
|
67 |
$r_type = $res['redirect_type']; |
|
68 |
$anchor = $res['anchor']; |
|
69 |
$extern = $res['extern']; |
|
70 |
if($anchor != '0') $anchor = ''.$anchor; |
|
71 |
else $anchor = FALSE; |
|
72 |
// set redirect-type |
|
73 |
if($r_type=='301') { |
|
74 |
if($php43) @header('HTTP/1.1 301 Moved Permanently', TRUE, 301); |
|
75 |
else @header('HTTP/1.1 301 Moved Permanently'); |
|
76 |
} |
|
77 |
if($target_page_id == -1) { |
|
78 |
if($extern!='') { |
|
79 |
header("Location: $extern".($anchor?'#'.$anchor:'')); |
|
80 |
} |
|
81 |
} else { |
|
82 |
// get link of target-page |
|
83 |
$table = TABLE_PREFIX.'pages'; |
|
84 |
$query_link = $database->query("SELECT link FROM $table WHERE page_id = '$target_page_id'"); |
|
85 |
if($query_link->numRows() == 1) { |
|
86 |
$res=$query_link->fetchRow(); |
|
87 |
$target_page_link = $res['link']; |
|
88 |
header('Location: '.WB_URL.PAGES_DIRECTORY.$target_page_link.PAGE_EXTENSION.($anchor?'#'.$anchor:'')); |
|
89 |
exit; |
|
90 |
} |
|
91 |
} |
|
92 |
} |
|
93 |
} |
|
94 |
|
|
95 |
// Backwards compatible Frontend filter support |
|
96 |
// include the output filter module routines |
|
97 |
if(file_exists(WB_PATH .'/modules/output_filter/filter-routines.php')) {@require_once(WB_PATH .'/modules/output_filter/filter-routines.php');} |
|
98 |
// Load Droplet engine |
|
99 |
if(file_exists(WB_PATH .'/modules/droplets/droplets.php')) { @require_once(WB_PATH .'/modules/droplets/droplets.php'); } |
|
100 |
|
|
101 |
//Get pagecontent in buffer for Droplets and/or Filter operations |
|
102 |
ob_start(); |
|
103 |
require(WB_PATH.'/templates/'.TEMPLATE.'/index.php'); |
|
104 |
$output = ob_get_contents(); |
|
105 |
if (ob_get_length() > 0) ob_end_clean(); |
|
106 |
|
|
107 |
if(function_exists('evalDroplets')) { $output = evalDroplets($output); } |
|
108 |
if(function_exists('filter_frontend_output')) { $output = filter_frontend_output($output); } |
|
109 |
echo $output; |
|
110 |
|
|
111 |
?> |
|
1 |
<?php |
|
2 |
/** |
|
3 |
* |
|
4 |
* @category frontend |
|
5 |
* @package page |
|
6 |
* @author WebsiteBaker Project |
|
7 |
* @copyright 2004-2009, Ryan Djurovich |
|
8 |
* @copyright 2009-2010, Website Baker Org. e.V. |
|
9 |
* @link http://www.websitebaker2.org/ |
|
10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
11 |
* @platform WebsiteBaker 2.8.x |
|
12 |
* @requirements PHP 4.4.9 and higher |
|
13 |
* @version $Id$ |
|
14 |
* @filesource $HeadURL$ |
|
15 |
* @lastmodified $Date$ |
|
16 |
* |
|
17 |
*/ |
|
18 |
|
|
19 |
$starttime = array_sum(explode(" ",microtime())); |
|
20 |
|
|
21 |
define('DEBUG', false); |
|
22 |
// Include config file |
|
23 |
$config_file = dirname(__FILE__).'/config.php'; |
|
24 |
if(file_exists($config_file)) |
|
25 |
{ |
|
26 |
require_once($config_file); |
|
27 |
} |
|
28 |
|
|
29 |
// Check if the config file has been set-up |
|
30 |
if(!defined('WB_PATH')) |
|
31 |
{ |
|
32 |
/* |
|
33 |
* Anmerkung: HTTP/1.1 verlangt einen absoluten URI inklusive dem Schema, |
|
34 |
* Hostnamen und absoluten Pfad als Argument von Location:, manche aber nicht alle |
|
35 |
* Clients akzeptieren jedoch auch relative URIs. |
|
36 |
*/ |
|
37 |
$host = $_SERVER['HTTP_HOST']; |
|
38 |
$uri = rtrim(dirname($_SERVER['PHP_SELF']), '/\\'); |
|
39 |
$file = 'install/index.php'; |
|
40 |
$target_url = 'http://'.$host.$uri.'/'.$file; |
|
41 |
header('Location: '.$target_url); |
|
42 |
exit; // make sure that subsequent code will not be executed |
|
43 |
} |
|
44 |
|
|
45 |
require_once(WB_PATH.'/framework/class.frontend.php'); |
|
46 |
// Create new frontend object |
|
47 |
$wb = new frontend(); |
|
48 |
|
|
49 |
// Figure out which page to display |
|
50 |
// Stop processing if intro page was shown |
|
51 |
$wb->page_select() or die(); |
|
52 |
|
|
53 |
// Collect info about the currently viewed page |
|
54 |
// and check permissions |
|
55 |
$wb->get_page_details(); |
|
56 |
|
|
57 |
// Collect general website settings |
|
58 |
$wb->get_website_settings(); |
|
59 |
|
|
60 |
// Load functions available to templates, modules and code sections |
|
61 |
// also, set some aliases for backward compatibility |
|
62 |
require(WB_PATH.'/framework/frontend.functions.php'); |
|
63 |
|
|
64 |
// redirect menu-link |
|
65 |
$this_page_id = PAGE_ID; |
|
66 |
|
|
67 |
$php43 = version_compare(phpversion(), '4.3', '>='); |
|
68 |
|
|
69 |
$sql = 'SELECT `module`, `block` FROM `'.TABLE_PREFIX.'sections` '; |
|
70 |
$sql .= 'WHERE `page_id` = '.(int)$this_page_id.' AND `module` = "menu_link"'; |
|
71 |
$query_this_module = $database->query($sql); |
|
72 |
if($query_this_module->numRows() == 1) // This is a menu_link. Get link of target-page and redirect |
|
73 |
{ |
|
74 |
// get target_page_id |
|
75 |
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_menu_link` WHERE `page_id` = '.(int)$this_page_id; |
|
76 |
$query_tpid = $database->query($sql); |
|
77 |
if($query_tpid->numRows() == 1) |
|
78 |
{ |
|
79 |
$res = $query_tpid->fetchRow(); |
|
80 |
$target_page_id = $res['target_page_id']; |
|
81 |
$redirect_type = $res['redirect_type']; |
|
82 |
$anchor = ($res['anchor'] != '0' ? '#'.(string)$res['anchor'] : ''); |
|
83 |
$extern = $res['extern']; |
|
84 |
// set redirect-type |
|
85 |
if($redirect_type == 301) |
|
86 |
{ |
|
87 |
if($php43) |
|
88 |
{ |
|
89 |
@header('HTTP/1.1 301 Moved Permanently', TRUE, 301); |
|
90 |
} |
|
91 |
else |
|
92 |
{ |
|
93 |
@header('HTTP/1.1 301 Moved Permanently'); |
|
94 |
} |
|
95 |
} |
|
96 |
if($target_page_id == -1) |
|
97 |
{ |
|
98 |
if($extern != '') |
|
99 |
{ |
|
100 |
$target_url = $extern.$anchor; |
|
101 |
header('Location: '.$target_url); |
|
102 |
exit; |
|
103 |
} |
|
104 |
} |
|
105 |
else |
|
106 |
{ |
|
107 |
// get link of target-page |
|
108 |
$sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$target_page_id; |
|
109 |
$target_page_link = $database->get_one($sql); |
|
110 |
if($target_page_link != null) |
|
111 |
{ |
|
112 |
$target_url = WB_URL.PAGES_DIRECTORY.$target_page_link.PAGE_EXTENSION.$anchor; |
|
113 |
header('Location: '.$target_url); |
|
114 |
exit; |
|
115 |
} |
|
116 |
} |
|
117 |
} |
|
118 |
} |
|
119 |
//Get pagecontent in buffer for Droplets and/or Filter operations |
|
120 |
ob_start(); |
|
121 |
require(WB_PATH.'/templates/'.TEMPLATE.'/index.php'); |
|
122 |
$output = ob_get_contents(); |
|
123 |
if(ob_get_length() > 0) { ob_end_clean(); } |
|
124 |
|
|
125 |
// wb->preprocess() -- replace all [wblink123] with real, internal links |
|
126 |
$wb->preprocess($output); |
|
127 |
// Load Droplet engine and process |
|
128 |
if(file_exists(WB_PATH .'/modules/droplets/droplets.php')) |
|
129 |
{ |
|
130 |
include_once(WB_PATH .'/modules/droplets/droplets.php'); |
|
131 |
if(function_exists('evalDroplets')) |
|
132 |
{ |
|
133 |
$output = evalDroplets($output); |
|
134 |
} |
|
135 |
} |
|
136 |
// Load backwards compatible frontend filter support and process |
|
137 |
if(file_exists(WB_PATH .'/modules/output_filter/filter-routines.php')) |
|
138 |
{ |
|
139 |
include_once(WB_PATH .'/modules/output_filter/filter-routines.php'); |
|
140 |
if(function_exists('filter_frontend_output')) |
|
141 |
{ |
|
142 |
$output = filter_frontend_output($output); |
|
143 |
} |
|
144 |
} |
|
145 |
echo $output; |
|
146 |
// end of wb-script |
|
147 |
exit; |
|
148 |
?> |
|
112 | 149 |
branches/2.8.x/wb/modules/wysiwyg/view.php | ||
---|---|---|
1 |
<?php |
|
2 |
|
|
3 |
// $Id$ |
|
4 |
|
|
5 |
/* |
|
6 |
|
|
7 |
Website Baker Project <http://www.websitebaker.org/> |
|
8 |
Copyright (C) 2004-2009, Ryan Djurovich |
|
9 |
|
|
10 |
Website Baker is free software; you can redistribute it and/or modify |
|
11 |
it under the terms of the GNU General Public License as published by |
|
12 |
the Free Software Foundation; either version 2 of the License, or |
|
13 |
(at your option) any later version. |
|
14 |
|
|
15 |
Website Baker is distributed in the hope that it will be useful, |
|
16 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
17 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
18 |
GNU General Public License for more details. |
|
19 |
|
|
20 |
You should have received a copy of the GNU General Public License |
|
21 |
along with Website Baker; if not, write to the Free Software |
|
22 |
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
23 |
|
|
24 |
*/ |
|
25 |
|
|
26 |
// Get content |
|
27 |
$get_content = $database->query("SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'"); |
|
28 |
$fetch_content = $get_content->fetchRow(); |
|
29 |
$content = ($fetch_content['content']); |
|
30 |
|
|
31 |
$wb->preprocess($content); |
|
32 |
|
|
33 |
echo $content; |
|
34 |
|
|
1 |
<?php |
|
2 |
/** |
|
3 |
* |
|
4 |
* @category modules |
|
5 |
* @package wysiwyg |
|
6 |
* @author WebsiteBaker Project |
|
7 |
* @copyright 2004-2009, Ryan Djurovich |
|
8 |
* @copyright 2009-2010, Website Baker Org. e.V. |
|
9 |
* @link http://www.websitebaker2.org/ |
|
10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
11 |
* @platform WebsiteBaker 2.8.x |
|
12 |
* @requirements PHP 4.4.9 and higher |
|
13 |
* @version $Id$ |
|
14 |
* @filesource $HeadURL$ |
|
15 |
* @lastmodified $Date$ |
|
16 |
* |
|
17 |
*/ |
|
18 |
|
|
19 |
// Get content |
|
20 |
$get_content = $database->query("SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'"); |
|
21 |
$fetch_content = $get_content->fetchRow(); |
|
22 |
$content = ($fetch_content['content']); |
|
23 |
|
|
24 |
echo $content; |
|
25 |
|
|
35 | 26 |
?> |
36 | 27 |
branches/2.8.x/wb/modules/wysiwyg/info.php | ||
---|---|---|
1 |
<?php |
|
2 |
|
|
3 |
// $Id$ |
|
4 |
|
|
5 |
/* |
|
6 |
|
|
7 |
Website Baker Project <http://www.websitebaker.org/> |
|
8 |
Copyright (C) 2004-2009, Ryan Djurovich |
|
9 |
|
|
10 |
Website Baker is free software; you can redistribute it and/or modify |
|
11 |
it under the terms of the GNU General Public License as published by |
|
12 |
the Free Software Foundation; either version 2 of the License, or |
|
13 |
(at your option) any later version. |
|
14 |
|
|
15 |
Website Baker is distributed in the hope that it will be useful, |
|
16 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
17 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
18 |
GNU General Public License for more details. |
|
19 |
|
|
20 |
You should have received a copy of the GNU General Public License |
|
21 |
along with Website Baker; if not, write to the Free Software |
|
22 |
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
23 |
|
|
24 |
*/ |
|
25 |
|
|
26 |
$module_directory = 'wysiwyg'; |
|
27 |
$module_name = 'WYSIWYG'; |
|
28 |
$module_function = 'page'; |
|
29 |
$module_version = '2.7'; |
|
30 |
$module_platform = '2.7 | 2.8.x'; |
|
31 |
$module_author = 'Ryan Djurovich'; |
|
32 |
$module_license = 'GNU General Public License'; |
|
33 |
$module_description = 'This module allows you to edit the contents of a page using a graphical editor'; |
|
34 |
|
|
1 |
<?php |
|
2 |
/** |
|
3 |
* |
|
4 |
* @category modules |
|
5 |
* @package wysiwyg |
|
6 |
* @author WebsiteBaker Project |
|
7 |
* @copyright 2004-2009, Ryan Djurovich |
|
8 |
* @copyright 2009-2010, Website Baker Org. e.V. |
|
9 |
* @link http://www.websitebaker2.org/ |
|
10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
11 |
* @platform WebsiteBaker 2.8.x |
|
12 |
* @requirements PHP 4.4.9 and higher |
|
13 |
* @version $Id$ |
|
14 |
* @filesource $HeadURL$ |
|
15 |
* @lastmodified $Date$ |
|
16 |
* |
|
17 |
*/ |
|
18 |
|
|
19 |
$module_directory = 'wysiwyg'; |
|
20 |
$module_name = 'WYSIWYG'; |
|
21 |
$module_function = 'page'; |
|
22 |
$module_version = '2.8'; |
|
23 |
$module_platform = '2.7 | 2.8.x'; |
|
24 |
$module_author = 'Ryan Djurovich'; |
|
25 |
$module_license = 'GNU General Public License'; |
|
26 |
$module_description = 'This module allows you to edit the contents of a page using a graphical editor'; |
|
27 |
|
|
35 | 28 |
?> |
36 | 29 |
Also available in: Unified diff
insert $wb->preprocess($output), preprocess no longer needed in modules
little modifaction in upgrade-script.php in function check_wb_tables
updated module wysiwyg, set to module version 2.8