@@ -603,7 +603,7 @@
$insert_search_results_footer = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_footer', '$search_results_footer', '')";
$database->query($insert_search_results_footer);
// Search no results
- $search_no_results = addslashes('
No results found');
+ $search_no_results = addslashes('
[TEXT_NO_RESULTS]');
$insert_search_no_results = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'no_results', '$search_no_results', '')";
$database->query($insert_search_no_results);
// Search template
Index: branches/2.6.x/wb/admin/pages/settings.php
===================================================================
--- branches/2.6.x/wb/admin/pages/settings.php (revision 451)
+++ branches/2.6.x/wb/admin/pages/settings.php (revision 452)
@@ -76,8 +76,8 @@
$template->set_block('page', 'main_block', 'main');
$template->set_var(array(
'PAGE_ID' => $results_array['page_id'],
- 'PAGE_TITLE' => (htmlentities($results_array['page_title'])),
- 'MENU_TITLE' => (htmlentities($results_array['menu_title'])),
+ 'PAGE_TITLE' => ($results_array['page_title']),
+ 'MENU_TITLE' => ($results_array['menu_title']),
'DESCRIPTION' => ($results_array['description']),
'KEYWORDS' => ($results_array['keywords']),
'MODIFIED_BY' => $user['display_name'],
@@ -249,7 +249,7 @@
for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
$template->set_var(array(
'ID' => $page['page_id'],
- 'TITLE' => ($title_prefix.htmlentities($page['page_title']))
+ 'TITLE' => ($title_prefix.$page['page_title'])
)
);
if($results_array['parent'] == $page['page_id']) {
Index: branches/2.6.x/wb/admin/pages/index.php
===================================================================
--- branches/2.6.x/wb/admin/pages/index.php (revision 451)
+++ branches/2.6.x/wb/admin/pages/index.php (revision 452)
@@ -166,15 +166,15 @@
get_permission('pages_modify') == true AND $can_modify == true) { ?>
-
+
|
-
+
|
-
+
|
@@ -462,7 +462,7 @@
for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
$template->set_var(array(
'ID' => $page['page_id'],
- 'TITLE' => ($title_prefix.htmlentities($page['page_title']))
+ 'TITLE' => ($title_prefix.$page['page_title'])
)
);
if($can_modify == true) {
Index: branches/2.6.x/wb/admin/pages/trash.php
===================================================================
--- branches/2.6.x/wb/admin/pages/trash.php (revision 451)
+++ branches/2.6.x/wb/admin/pages/trash.php (revision 452)
@@ -141,21 +141,21 @@
|
get_permission('pages_modify') == true AND $can_modify == true AND $page['visibility'] != 'heading') { ?>
-
+
|
'.(htmlentities($page['page_title'])).'';
+ echo ''.($page['page_title']).'';
}
?>
|
-
+
|
Index: branches/2.6.x/wb/admin/pages/settings2.php
===================================================================
--- branches/2.6.x/wb/admin/pages/settings2.php (revision 451)
+++ branches/2.6.x/wb/admin/pages/settings2.php (revision 452)
@@ -41,7 +41,9 @@
// Get values
$page_title = $admin->add_slashes($admin->get_post_escaped('page_title'));
+$page_title = my_htmlspecialchars($page_title);
$menu_title = $admin->add_slashes($admin->get_post_escaped('menu_title'));
+$menu_title = my_htmlspecialchars($menu_title);
$description = $admin->add_slashes($admin->get_post('description'));
$keywords = $admin->add_slashes($admin->get_post('keywords'));
$parent = $admin->get_post('parent');
@@ -55,10 +57,10 @@
$menu = $admin->get_post('menu');
// Validate data
-if($page_title == '') {
+if($page_title == '' || substr($page_title,0,1)=='.') {
$admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']);
}
-if($menu_title == '') {
+if($menu_title == '' || substr($menu_title,0,1)=='.') {
$admin->print_error($MESSAGE['PAGES']['BLANK_MENU_TITLE']);
}
@@ -114,7 +116,7 @@
// Work-out what the link should be
if($parent == '0') {
$link = '/'.page_filename($menu_title);
- $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'.php';
+ $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION;
} else {
$parent_section = '';
$parent_titles = array_reverse(get_parent_titles($parent));
@@ -123,7 +125,7 @@
}
if($parent_section == '/') { $parent_section = ''; }
$link = '/'.$parent_section.page_filename($menu_title);
- $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).'.php';
+ $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION;
}
// Check if a page with same page filename exists
@@ -142,9 +144,10 @@
$page_trail = get_page_trail($page_id);
// Make sure link is not overwritten if page uses the menu link module
-if(strstr($old_link, '://') != '') {
+$query_sections = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'menu_link'");
+if($query_sections->numRows() > 0) {
$link = $old_link;
-}
+}
// Update page settings in the pages table
$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', page_title = '$page_title', menu_title = '$menu_title', menu = '$menu', level = '$level', page_trail = '$page_trail', root_parent = '$root_parent', link = '$link', template = '$template', target = '$target', description = '$description', keywords = '$keywords', position = '$position', visibility = '$visibility', searching = '$searching', language = '$language', admin_groups = '$admin_groups', viewing_groups = '$viewing_groups' WHERE page_id = '$page_id'";
@@ -164,7 +167,7 @@
// First check if we need to create a new file
if($old_link != $link) {
// Delete old file
- unlink(WB_PATH.PAGES_DIRECTORY.$old_link.'.php');
+ unlink(WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION);
// Create access file
create_access_file($filename,$page_id,$level);
// Move a directory for this page
@@ -187,11 +190,11 @@
// Update level and link
$database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$new_sub_link', level = '$new_sub_level' WHERE page_id = '".$sub['page_id']."' LIMIT 1");
// Re-write the access file for this page
- $old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.'.php';
+ $old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION;
if(file_exists($old_subpage_file)) {
unlink($old_subpage_file);
}
- create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.'.php', $sub['page_id'], $new_sub_level);
+ create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level);
}
}
}
@@ -199,7 +202,7 @@
}
// Function to fix page trail of subs
-function fix_page_trail($parent) {
+function fix_page_trail($parent,$root_parent) {
// Get objects and vars from outside this function
global $admin, $template, $database, $TEXT, $MESSAGE;
// Get page list from database
@@ -210,14 +213,14 @@
if($get_pages->numRows() > 0) {
while($page = $get_pages->fetchRow()) {
// Fix page trail
- $database->query("UPDATE ".TABLE_PREFIX."pages SET page_trail = '".get_page_trail($page['page_id'])."' WHERE page_id = '".$page['page_id']."'");
+ $database->query("UPDATE ".TABLE_PREFIX."pages SET ".($root_parent != 0 ?"root_parent = '$root_parent', ":"")." page_trail = '".get_page_trail($page['page_id'])."' WHERE page_id = '".$page['page_id']."'");
// Run this query on subs
- fix_page_trail($page['page_id']);
+ fix_page_trail($page['page_id'],$root_parent);
}
}
}
// Fix sub-pages page trail
-fix_page_trail($page_id);
+fix_page_trail($page_id,$root_parent);
/* END page "access file" code */
Index: branches/2.6.x/wb/admin/pages/sections.php
===================================================================
--- branches/2.6.x/wb/admin/pages/sections.php (revision 451)
+++ branches/2.6.x/wb/admin/pages/sections.php (revision 452)
@@ -138,7 +138,7 @@
|
:
-
+
-
-
Index: branches/2.6.x/wb/admin/pages/modify.php
===================================================================
--- branches/2.6.x/wb/admin/pages/modify.php (revision 451)
+++ branches/2.6.x/wb/admin/pages/modify.php (revision 452)
@@ -60,7 +60,7 @@
$template->set_block('page', 'main_block', 'main');
$template->set_var(array(
'PAGE_ID' => $results_array['page_id'],
- 'PAGE_TITLE' => (htmlentities($results_array['page_title'])),
+ 'PAGE_TITLE' => ($results_array['page_title']),
'MODIFIED_BY' => $user['display_name'],
'MODIFIED_BY_USERNAME' => $user['username'],
'MODIFIED_WHEN' => $modified_ts,
@@ -97,15 +97,19 @@
$template->pparse('output', 'page');
// Get sections for this page
+$module_permissions = $_SESSION['MODULE_PERMISSIONS'];
$query_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' ORDER BY position ASC");
if($query_sections->numRows() > 0) {
while($section = $query_sections->fetchRow()) {
$section_id = $section['section_id'];
$module = $section['module'];
- // Include the modules editing script if it exists
- if(file_exists(WB_PATH.'/modules/'.$module.'/modify.php')) {
- echo '';
- require(WB_PATH.'/modules/'.$module.'/modify.php');
+ //Have permission?
+ if(!is_numeric(array_search($module, $module_permissions))) {
+ // Include the modules editing script if it exists
+ if(file_exists(WB_PATH.'/modules/'.$module.'/modify.php')) {
+ echo '';
+ require(WB_PATH.'/modules/'.$module.'/modify.php');
+ }
}
}
}
Index: branches/2.6.x/wb/admin/pages/add.php
===================================================================
--- branches/2.6.x/wb/admin/pages/add.php (revision 451)
+++ branches/2.6.x/wb/admin/pages/add.php (revision 452)
@@ -33,6 +33,7 @@
// Get values
$title = $admin->add_slashes($admin->get_post_escaped('title'));
+$title = my_htmlspecialchars($title);
$module = $admin->get_post('type');
$parent = $admin->get_post('parent');
$visibility = $admin->get_post('visibility');
@@ -47,7 +48,7 @@
}
// Validate data
-if($title == '') {
+if($title == '' || substr($title,0,1)=='.') {
$admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']);
}
Index: branches/2.6.x/wb/admin/login/index.php
===================================================================
--- branches/2.6.x/wb/admin/login/index.php (revision 451)
+++ branches/2.6.x/wb/admin/login/index.php (revision 452)
@@ -1,70 +1,70 @@
-
- Copyright (C) 2004-2007, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker 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. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-require_once("../../config.php");
-require_once(WB_PATH."/framework/class.login.php");
-
-if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') {
- // Generate username field name
- $username_fieldname = 'username_';
- $password_fieldname = 'password_';
- $salt = "abchefghjkmnpqrstuvwxyz0123456789";
- srand((double)microtime()*1000000);
- $i = 0;
- while ($i <= 7) {
- $num = rand() % 33;
- $tmp = substr($salt, $num, 1);
- $username_fieldname = $username_fieldname . $tmp;
- $password_fieldname = $password_fieldname . $tmp;
- $i++;
- }
-} else {
- $username_fieldname = 'username';
- $password_fieldname = 'password';
-}
-
-$thisApp = new Login(
- array(
- 'MAX_ATTEMPS' => "50",
- 'WARNING_URL' => ADMIN_URL."/login/warning.html",
- 'USERNAME_FIELDNAME' => $username_fieldname,
- 'PASSWORD_FIELDNAME' => $password_fieldname,
- 'REMEMBER_ME_OPTION' => SMART_LOGIN,
- 'MIN_USERNAME_LEN' => "2",
- 'MIN_PASSWORD_LEN' => "2",
- 'MAX_USERNAME_LEN' => "30",
- 'MAX_PASSWORD_LEN' => "30",
- 'LOGIN_URL' => ADMIN_URL."/login/index.php",
- 'DEFAULT_URL' => ADMIN_URL."/start/index.php",
- 'TEMPLATE_DIR' => ADMIN_PATH."/login",
- 'TEMPLATE_FILE' => "template.html",
- 'FRONTEND' => false,
- 'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
- 'USERS_TABLE' => TABLE_PREFIX."users",
- 'GROUPS_TABLE' => TABLE_PREFIX."groups",
- )
- );
-
+
+ Copyright (C) 2004-2007, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker 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. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+
+require_once("../../config.php");
+require_once(WB_PATH."/framework/class.login.php");
+
+if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') {
+ // Generate username field name
+ $username_fieldname = 'username_';
+ $password_fieldname = 'password_';
+ $salt = "abchefghjkmnpqrstuvwxyz0123456789";
+ srand((double)microtime()*1000000);
+ $i = 0;
+ while ($i <= 7) {
+ $num = rand() % 33;
+ $tmp = substr($salt, $num, 1);
+ $username_fieldname = $username_fieldname . $tmp;
+ $password_fieldname = $password_fieldname . $tmp;
+ $i++;
+ }
+} else {
+ $username_fieldname = 'username';
+ $password_fieldname = 'password';
+}
+
+$thisApp = new Login(
+ array(
+ 'MAX_ATTEMPS' => "3",
+ 'WARNING_URL' => ADMIN_URL."/login/warning.html",
+ 'USERNAME_FIELDNAME' => $username_fieldname,
+ 'PASSWORD_FIELDNAME' => $password_fieldname,
+ 'REMEMBER_ME_OPTION' => SMART_LOGIN,
+ 'MIN_USERNAME_LEN' => "2",
+ 'MIN_PASSWORD_LEN' => "2",
+ 'MAX_USERNAME_LEN' => "30",
+ 'MAX_PASSWORD_LEN' => "30",
+ 'LOGIN_URL' => ADMIN_URL."/login/index.php",
+ 'DEFAULT_URL' => ADMIN_URL."/start/index.php",
+ 'TEMPLATE_DIR' => ADMIN_PATH."/login",
+ 'TEMPLATE_FILE' => "template.html",
+ 'FRONTEND' => false,
+ 'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
+ 'USERS_TABLE' => TABLE_PREFIX."users",
+ 'GROUPS_TABLE' => TABLE_PREFIX."groups",
+ )
+ );
+
?>
\ No newline at end of file
Index: branches/2.6.x/wb/admin/modules/details.php
===================================================================
--- branches/2.6.x/wb/admin/modules/details.php (revision 451)
+++ branches/2.6.x/wb/admin/modules/details.php (revision 452)
@@ -55,6 +55,27 @@
$module = $result->fetchRow();
}
+// Get language description if available
+// First get users defined language
+$query = "SELECT language FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."'";
+$results = $database->query($query);
+if($results->numRows() > 0) {
+ // We found a language for the user, store it
+ $user_info=$results->fetchRow();
+ $user_language = $user_info['language'];
+
+ // Next check for language file in module dir and insert the variables from that file
+ if(file_exists(WB_PATH.'/modules/'.$file.'/languages/'.$user_language.'.php')) {
+ require(WB_PATH.'/modules/'.$file.'/languages/'.$user_language.'.php');
+
+ // Check to see if new variable exists... -> $module_description
+ if (isset($module_description)) {
+ // Override the module-description with correct desription in users language
+ $module['description']=$module_description;
+ }
+ }
+}
+
$template->set_var(array(
'NAME' => $module['name'],
'AUTHOR' => $module['author'],
Index: branches/2.6.x/wb/modules/wysiwyg/save.php
===================================================================
--- branches/2.6.x/wb/modules/wysiwyg/save.php (revision 451)
+++ branches/2.6.x/wb/modules/wysiwyg/save.php (revision 452)
@@ -29,10 +29,14 @@
$update_when_modified = true; // Tells script to update when this page was last updated
require(WB_PATH.'/modules/admin.php');
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
// Update the mod_wysiwygs table with the contents
if(isset($_POST['content'.$section_id])) {
$content = $admin->add_slashes($_POST['content'.$section_id]);
- $text = strip_tags($content);
+ // searching in $text will be much easier this way
+ $text = umlauts_to_entities(strip_tags($content), strtoupper(DEFAULT_CHARSET), 0);
$database = new database();
$query = "UPDATE ".TABLE_PREFIX."mod_wysiwyg SET content = '$content', text = '$text' WHERE section_id = '$section_id'";
$database->query($query);
Index: branches/2.6.x/wb/modules/form/install.php
===================================================================
--- branches/2.6.x/wb/modules/form/install.php (revision 451)
+++ branches/2.6.x/wb/modules/form/install.php (revision 452)
@@ -87,12 +87,12 @@
$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_form_fields, [TP]mod_form_settings, [TP]pages WHERE ";
$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'form')");
// Query body
- $query_body_code = " [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.header [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'
- OR [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.footer [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'
- OR [TP]pages.page_id = [TP]mod_form_fields.page_id AND [TP]mod_form_fields.title [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'";
+ $query_body_code = " [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.header LIKE \'%[STRING]%\'
+ OR [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.footer LIKE \'%[STRING]%\'
+ OR [TP]pages.page_id = [TP]mod_form_fields.page_id AND [TP]mod_form_fields.title LIKE \'%[STRING]%\' ";
$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'form')");
// Query end
- $query_end_code = '';
+ $query_end_code = "";
$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'form')");
// Insert blank row (there needs to be at least on row for the search to work)
Index: branches/2.6.x/wb/modules/form/view.php
===================================================================
--- branches/2.6.x/wb/modules/form/view.php (revision 451)
+++ branches/2.6.x/wb/modules/form/view.php (revision 452)
@@ -380,7 +380,9 @@
if(isset($success) AND $success == true) {
echo $success_message;
} else {
- echo $TEXT['ERROR'];
+ if(isset($success) AND $success == false) {
+ echo $TEXT['ERROR'];
+ }
}
}
Index: branches/2.6.x/wb/modules/form/modify.php
===================================================================
--- branches/2.6.x/wb/modules/form/modify.php (revision 451)
+++ branches/2.6.x/wb/modules/form/modify.php (revision 452)
@@ -31,6 +31,9 @@
// Must include code to stop this file being access directly
if(!defined('WB_PATH')) { exit("Cannot access this file directly"); }
+//Delete all form fields with no title
+$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_fields WHERE page_id = '$page_id' and section_id = '$section_id' and title=''");
+
?>
Index: branches/2.6.x/wb/modules/news/install.php
===================================================================
--- branches/2.6.x/wb/modules/news/install.php (revision 451)
+++ branches/2.6.x/wb/modules/news/install.php (revision 452)
@@ -130,7 +130,8 @@
$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id) VALUES ('0', '0')");
// Make news post access files dir
- make_dir(WB_PATH.PAGES_DIRECTORY.'/posts/');
+ require_once(WB_PATH.'/framework/functions.php');
+ make_dir(WB_PATH.PAGES_DIRECTORY.'/posts');
}
Index: branches/2.6.x/wb/modules/news/rss.php
===================================================================
--- branches/2.6.x/wb/modules/news/rss.php (revision 451)
+++ branches/2.6.x/wb/modules/news/rss.php (revision 452)
@@ -46,25 +46,27 @@
$wb->get_website_settings();
// Sending XML header
-header("Content-type: text/xml");
+header("Content-type: text/xml; charset=utf-8" );
// Header info
// Required by CSS 2.0
+?>
+
+
+<?php echo PAGE_TITLE; ?>
+http://
+
+
+
+
+
+
+
+Website Baker Content Management System
-echo "";
-echo "";
-echo "".PAGE_TITLE."";
-echo "".WB_URL."";
-echo "".PAGE_DESCRIPTION."";
-
-// Optional header info
-echo "".DEFAULT_LANGUAGE."";
-echo "".WB_URL."";
-echo "".SERVER_EMAIL."";
-echo "".SERVER_EMAIL."";
-echo "".WEBSITE_TITLE."";
-echo "Website Baker Content Management System";
-
+query($query);
//Generating the news items
-while($item = $result->fetchRow($result)){
+while($item = $result->fetchRow($result)){ ?>
- echo "- ";
- echo "".$item["title"]."";
- // Stripping HTML Tags for text-only visibility
- echo "".strip_tags($item["content_short"])."";
- echo "".WB_URL."/pages".$item["link"].PAGE_EXTENSION."";
- /* Add further (non required) information here like ie.
- echo "".$item["posted_by"]."");
- etc.
- */
- echo "
";
+-
+<![CDATA[<?php echo stripslashes($item["title"]); ?>]]>
+]]>
+
+
+
-}
+
-// Writing footer information
-echo "";
-echo "";
-
-?>
\ No newline at end of file
+
+
\ No newline at end of file
Index: branches/2.6.x/wb/modules/news/uninstall.php
===================================================================
--- branches/2.6.x/wb/modules/news/uninstall.php (revision 451)
+++ branches/2.6.x/wb/modules/news/uninstall.php (revision 452)
@@ -32,7 +32,8 @@
$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_groups");
$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_comments");
$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_settings");
-require(WB_PATH.'/framework/functions.php');
+
+require_once(WB_PATH.'/framework/functions.php');
rm_full_dir(WB_PATH.PAGES_DIRECTORY.'/posts');
?>
\ No newline at end of file
Index: branches/2.6.x/wb/account/login.php
===================================================================
--- branches/2.6.x/wb/account/login.php (revision 451)
+++ branches/2.6.x/wb/account/login.php (revision 452)
@@ -1,86 +1,86 @@
-
- Copyright (C) 2004-2007, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker 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. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-require_once("../config.php");
-
-// Make sure the login is enabled
-if(!FRONTEND_LOGIN) {
- if(INTRO_PAGE) {
- header('Location: '.WB_URL.PAGES_DIRECTORY.'/index'.PAGE_EXTENSION);
- exit(0);
- } else {
- header('Location: '.WB_URL.'/index'.PAGE_EXTENSION);
- exit(0);
- }
-}
-
-// Required page details
-$page_id = 0;
-$page_description = '';
-$page_keywords = '';
-define('PAGE_ID', 0);
-define('ROOT_PARENT', 0);
-define('PARENT', 0);
-define('LEVEL', 0);
-define('PAGE_TITLE', 'Please login');
-define('MENU_TITLE', 'Please login');
-define('VISIBILITY', 'public');
-// Set the page content include file
-define('PAGE_CONTENT', WB_PATH.'/account/login_form.php');
-
-require_once(WB_PATH.'/framework/class.login.php');
-
-// Create new login app
-$thisApp = new Login(
- array(
- "MAX_ATTEMPS" => "50",
- "WARNING_URL" => ADMIN_URL."/login/warning.html",
- "USERNAME_FIELDNAME" => 'username',
- "PASSWORD_FIELDNAME" => 'password',
- "REMEMBER_ME_OPTION" => SMART_LOGIN,
- "MIN_USERNAME_LEN" => "2",
- "MIN_PASSWORD_LEN" => "2",
- "MAX_USERNAME_LEN" => "30",
- "MAX_PASSWORD_LEN" => "30",
- "LOGIN_URL" => WB_URL."/account/login".PAGE_EXTENSION.'?redirect='.$_REQUEST['redirect'],
- "DEFAULT_URL" => WB_URL.PAGES_DIRECTORY."/index".PAGE_EXTENSION,
- "TEMPLATE_DIR" => ADMIN_PATH."/login",
- "TEMPLATE_FILE" => "template.html",
- "FRONTEND" => true,
- "FORGOTTEN_DETAILS_APP" => WB_URL."/account/forgot.php".PAGE_EXTENSION,
- "USERS_TABLE" => TABLE_PREFIX."users",
- "GROUPS_TABLE" => TABLE_PREFIX."groups",
- "REDIRECT_URL" => $_REQUEST['redirect']
- )
- );
-
-// Set extra outsider var
-$globals[] = 'thisApp';
-
-// Include the index (wrapper) file
-require(WB_PATH.'/index.php');
-
-
+
+ Copyright (C) 2004-2007, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker 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. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+
+require_once("../config.php");
+
+// Make sure the login is enabled
+if(!FRONTEND_LOGIN) {
+ if(INTRO_PAGE) {
+ header('Location: '.WB_URL.PAGES_DIRECTORY.'/index'.PAGE_EXTENSION);
+ exit(0);
+ } else {
+ header('Location: '.WB_URL.'/index'.PAGE_EXTENSION);
+ exit(0);
+ }
+}
+
+// Required page details
+$page_id = 0;
+$page_description = '';
+$page_keywords = '';
+define('PAGE_ID', 0);
+define('ROOT_PARENT', 0);
+define('PARENT', 0);
+define('LEVEL', 0);
+define('PAGE_TITLE', 'Please login');
+define('MENU_TITLE', 'Please login');
+define('VISIBILITY', 'public');
+// Set the page content include file
+define('PAGE_CONTENT', WB_PATH.'/account/login_form.php');
+
+require_once(WB_PATH.'/framework/class.login.php');
+
+// Create new login app
+$thisApp = new Login(
+ array(
+ "MAX_ATTEMPS" => "3",
+ "WARNING_URL" => ADMIN_URL."/login/warning.html",
+ "USERNAME_FIELDNAME" => 'username',
+ "PASSWORD_FIELDNAME" => 'password',
+ "REMEMBER_ME_OPTION" => SMART_LOGIN,
+ "MIN_USERNAME_LEN" => "2",
+ "MIN_PASSWORD_LEN" => "2",
+ "MAX_USERNAME_LEN" => "30",
+ "MAX_PASSWORD_LEN" => "30",
+ "LOGIN_URL" => WB_URL."/account/login".PAGE_EXTENSION.'?redirect='.$_REQUEST['redirect'],
+ "DEFAULT_URL" => WB_URL.PAGES_DIRECTORY."/index".PAGE_EXTENSION,
+ "TEMPLATE_DIR" => ADMIN_PATH."/login",
+ "TEMPLATE_FILE" => "template.html",
+ "FRONTEND" => true,
+ "FORGOTTEN_DETAILS_APP" => WB_URL."/account/forgot.php".PAGE_EXTENSION,
+ "USERS_TABLE" => TABLE_PREFIX."users",
+ "GROUPS_TABLE" => TABLE_PREFIX."groups",
+ "REDIRECT_URL" => $_REQUEST['redirect']
+ )
+ );
+
+// Set extra outsider var
+$globals[] = 'thisApp';
+
+// Include the index (wrapper) file
+require(WB_PATH.'/index.php');
+
+
?>
\ No newline at end of file
Index: branches/2.6.x/wb/framework/convert.php
===================================================================
--- branches/2.6.x/wb/framework/convert.php (revision 451)
+++ branches/2.6.x/wb/framework/convert.php (revision 452)
@@ -25,8 +25,7 @@
/*
Character Conversion file
-This file helps convert possible error-causing
-characters to equivalent non-error-causing ones
+to convert some entities to there 7bit equivalents
*/
if(!defined('WB_URL')) {
header('Location: ../index.php');
@@ -34,41 +33,269 @@
}
$conversion_array = array(
-'À'=>'A','�?'=>'A','Â'=>'A','Ã'=>'A','Ä'=>'Ae', 'Ä'=>'A',
-'Å'=>'A','Ā'=>'A','Ą'=>'A','Ă'=>'A', 'Æ'=>'Ae',
-'Ç'=>'C','Ć'=>'C','Č'=>'C','Ĉ'=>'C','Ċ'=>'C',
-'Ď'=>'D','�?'=>'D','�?'=>'D',
-'È'=>'E','É'=>'E','Ê'=>'E','Ë'=>'E','Ē'=>'E',
-'Ę'=>'E','Ě'=>'E','Ĕ'=>'E','Ė'=>'E',
-'Ĝ'=>'G','Ğ'=>'G','Ġ'=>'G','Ģ'=>'G',
-'Ĥ'=>'H','Ħ'=>'H',
-'Ì'=>'I','�?'=>'I','Î'=>'I','�?'=>'I','Ī'=>'I', 'Ĩ'=>'I','Ĭ'=>'I','Į'=>'I','İ'=>'I',
-'IJ'=>'IJ','Ĵ'=>'J','Ķ'=>'K',
-'�?'=>'K','Ľ'=>'K','Ĺ'=>'K','Ļ'=>'K','Ŀ'=>'K',
-'Ñ'=>'N','Ń'=>'N','Ň'=>'N','Ņ'=>'N','Ŋ'=>'N',
-'Ò'=>'O','Ó'=>'O','Ô'=>'O','Õ'=>'O','Ö'=>'Oe',
-'Ö'=>'Oe', 'Ø'=>'O','Ō'=>'O','�?'=>'O','Ŏ'=>'O',
-'Œ'=>'OE', 'Ŕ'=>'R','Ř'=>'R','Ŗ'=>'R',
-'Ś'=>'S','Š'=>'S','Ş'=>'S','Ŝ'=>'S','Ș'=>'S',
-'Ť'=>'T','Ţ'=>'T','Ŧ'=>'T','Ț'=>'T',
-'Ù'=>'U','Ú'=>'U','Û'=>'U','Ü'=>'Ue','Ū'=>'U',
-'Ü'=>'Ue', 'Ů'=>'U','Ű'=>'U','Ŭ'=>'U','Ũ'=>'U','Ų'=>'U',
-'Ŵ'=>'W', '�?'=>'Y','Ŷ'=>'Y','Ÿ'=>'Y', 'Ź'=>'Z','Ž'=>'Z','Ż'=>'Z',
-'Þ'=>'T','Þ'=>'T', 'à'=>'a','á'=>'a','â'=>'a','ã'=>'a','ä'=>'ae',
-'ä'=>'ae', 'å'=>'a','�?'=>'a','ą'=>'a','ă'=>'a',
-'æ'=>'ae', 'ç'=>'c','ć'=>'c','�?'=>'c','ĉ'=>'c','ċ'=>'c',
-'�?'=>'d','đ'=>'d','ð'=>'d', 'è'=>'e','é'=>'e','ê'=>'e','ë'=>'e','ē'=>'e',
-'ę'=>'e','ě'=>'e','ĕ'=>'e','ė'=>'e', 'ƒ'=>'f',
-'�?'=>'g','ğ'=>'g','ġ'=>'g','ģ'=>'g', 'ĥ'=>'h','ħ'=>'h',
-'ì'=>'i','í'=>'i','î'=>'i','ï'=>'i','ī'=>'i', 'ĩ'=>'i','ĭ'=>'i','į'=>'i','ı'=>'i',
-'ij'=>'ij', 'ĵ'=>'j', 'ķ'=>'k','ĸ'=>'k', 'ł'=>'l','ľ'=>'l','ĺ'=>'l','ļ'=>'l','ŀ'=>'l',
-'ñ'=>'n','ń'=>'n','ň'=>'n','ņ'=>'n','ʼn'=>'n', 'ŋ'=>'n',
-'ò'=>'o','ó'=>'o','ô'=>'o','õ'=>'o','ö'=>'oe', 'ö'=>'oe',
-'ø'=>'o','�?'=>'o','ő'=>'o','�?'=>'o', 'œ'=>'oe', 'ŕ'=>'r','ř'=>'r','ŗ'=>'r',
-'š'=>'s', 'ù'=>'u','ú'=>'u','û'=>'u','ü'=>'ue','ū'=>'u', 'ü'=>'ue',
-'ů'=>'u','ű'=>'u','ŭ'=>'u','ũ'=>'u','ų'=>'u', 'ŵ'=>'w',
-'ý'=>'y','ÿ'=>'y','ŷ'=>'y', 'ž'=>'z','ż'=>'z','ź'=>'z', 'þ'=>'t', 'ß'=>'ss', 'ſ'=>'ss',
-'ä'=>'ae', 'ö'=>'oe', 'ü'=>'ue', 'Ä'=>'Ae', 'Ö'=>'Oe', 'Ü'=>'Ue'
+
+//### LATIN
+'Á'=>'A','á'=>'a','Â'=>'A','â'=>'a','Æ'=>'AE','æ'=>'ae','À'=>'A','à'=>'a','Å'=>'A','å'=>'a','Ã'=>'A','ã'=>'a','Ä'=>'AE','ä'=>'ae',
+'Ç'=>'C','ç'=>'c',
+'É'=>'E','é'=>'e','Ê'=>'E','ê'=>'e','È'=>'E','è'=>'e','Ë'=>'E','ë'=>'e',
+'Í'=>'I','í'=>'i','Î'=>'I','î'=>'i','Ì'=>'I','ì'=>'i','Ï'=>'I','ï'=>'i',
+'Ñ'=>'N','ñ'=>'n',
+'Ó'=>'O','ó'=>'o','Ô'=>'O','ô'=>'o','Œ'=>'OE','œ'=>'oe','Ò'=>'O','ò'=>'o','Õ'=>'O','õ'=>'o','Ö'=>'OE','ö'=>'oe',
+'Š'=>'S','š'=>'s',
+'ß'=>'ss',
+'Ú'=>'U','ú'=>'u','Û'=>'U','û'=>'u','Ù'=>'U','ù'=>'u','Ü'=>'UE','ü'=>'ue',
+'Ý'=>'Y','ý'=>'y','Ÿ'=>'Y','ÿ'=>'y',
+'Š'=>'S',
+'Œ'=>'OE','œ'=>'oe',
+'š'=>'s',
+'Ÿ'=>'Y',
+'©'=>'(c)','®'=>'(r)','Ð'=>'D','×'=>'x','Ø'=>'O','Þ'=>'TH','ð'=>'d','ø'=>'o','þ'=>'th',
+
+// latin extended-A
+'Ā'=>'A','ā'=>'a','Ă'=>'A','ă'=>'a','Ą'=>'A','ą'=>'a',
+'Ć'=>'C','ć'=>'c','Ĉ'=>'C','ĉ'=>'c','č'=>'c','Č'=>'C','ċ'=>'c','Ċ'=>'C',
+'đ'=>'d','Đ'=>'D','ď'=>'d','Ď'=>'D',
+'ē'=>'e','Ē'=>'E','Ĕ'=>'E','ĕ'=>'e','Ė'=>'E','ė'=>'e','Ę'=>'E','ę'=>'e','Ě'=>'E','ě'=>'e',
+'Ĝ'=>'G','ĝ'=>'g','Ğ'=>'G','ğ'=>'g','Ġ'=>'G','ġ'=>'g','Ģ'=>'G','ģ'=>'g',
+'Ĥ'=>'H','ĥ'=>'h','Ħ'=>'H','ħ'=>'h',
+'Ĩ'=>'I','ĩ'=>'i','Ī'=>'I','ī'=>'i','Ĭ'=>'I','ĭ'=>'i','Į'=>'I','į'=>'i','İ'=>'I','ı'=>'i',
+'IJ'=>'IJ','ij'=>'ij',
+'Ĵ'=>'J','ĵ'=>'j',
+'Ķ'=>'K','ķ'=>'k','ĸ'=>'k',
+'Ĺ'=>'L','ĺ'=>'l','Ļ'=>'L','ļ'=>'l','Ľ'=>'L','ľ'=>'l','Ŀ'=>'L','ŀ'=>'l','Ł'=>'L','ł'=>'l',
+'Ń'=>'N','ń'=>'n','Ņ'=>'N','ņ'=>'n','Ň'=>'N','ň'=>'n','ʼn'=>'n','Ŋ'=>'N','ŋ'=>'n',
+'Ō'=>'O','ō'=>'o','Ŏ'=>'O','ŏ'=>'o','Ő'=>'O','ő'=>'o',
+'Ŕ'=>'R','ŕ'=>'r','Ŗ'=>'R','ŗ'=>'r','Ř'=>'R','ř'=>'r',
+'Ś'=>'S','ś'=>'s','Ŝ'=>'S','ŝ'=>'s','Ş'=>'S','ş'=>'s',
+'Ţ'=>'T','ţ'=>'t','Ť'=>'T','ť'=>'t','Ŧ'=>'T','ŧ'=>'t',
+'Ũ'=>'U','ũ'=>'u','Ū'=>'U','ū'=>'u','Ŭ'=>'U','ŭ'=>'u','Ů'=>'U','ů'=>'u','Ű'=>'U','ű'=>'u','Ų'=>'U','ų'=>'u',
+'Ŵ'=>'W','ŵ'=>'w',
+'Ŷ'=>'Y','ŷ'=>'y','Ÿ'=>'Y',
+'Ź'=>'Z','ź'=>'z','Ż'=>'Z','ż'=>'z','Ž'=>'Z','ž'=>'z',
+'ſ'=>'s',
+'ff'=>'ff','fi'=>'fi','fl'=>'fl','ffi'=>'ffi','ffl'=>'ffl',
+'ſt'=>'st',
+'st'=>'st',
+// latin extended-b
+'ƀ'=>'b','Ɓ'=>'B','Ƃ'=>'B','ƃ'=>'b','Ƅ'=>'6','ƅ'=>'6',
+'Ɔ'=>'O','Ƈ'=>'C','ƈ'=>'c','Ɖ'=>'D','Ɗ'=>'D','Ƌ'=>'D',
+'ƌ'=>'d','ƍ'=>'d','Ǝ'=>'E','Ə'=>'e','Ɛ'=>'E','Ƒ'=>'F',
+'ƒ'=>'f','Ɠ'=>'G','Ɣ'=>'G','ƕ'=>'hw','Ɩ'=>'I','Ɨ'=>'I',
+'Ƙ'=>'K','ƙ'=>'k','ƚ'=>'l','ƛ'=>'l','Ɯ'=>'M','Ɲ'=>'N',
+'ƞ'=>'n','Ɵ'=>'O','Ơ'=>'O','ơ'=>'o','Ƣ'=>'OI','ƣ'=>'oi',
+'Ƥ'=>'P','ƥ'=>'p','Ʀ'=>'YR','Ƨ'=>'2','ƨ'=>'2','Ʃ'=>'ESH',
+'ƪ'=>'esh','ƫ'=>'t','Ƭ'=>'T','ƭ'=>'t','Ʈ'=>'T','Ư'=>'U',
+'ư'=>'u','Ʊ'=>'V','Ʋ'=>'v','Ƴ'=>'Y','ƴ'=>'y','Ƶ'=>'Z',
+'ƶ'=>'z','Ʒ'=>'EZH','Ƹ'=>'EZH','ƹ'=>'ezh','ƺ'=>'ezh','ƻ'=>'2',
+'Ƽ'=>'5','ƽ'=>'5','ƾ'=>'-','ƿ'=>'w','ǀ'=>'-','ǁ'=>'-',
+'ǂ'=>'-','ǃ'=>'-','DŽ'=>'DZ','Dž'=>'DZ','dž'=>'dz','LJ'=>'LJ',
+'Lj'=>'Lj','lj'=>'lj','NJ'=>'NJ','Nj'=>'Nj','nj'=>'nj','Ǎ'=>'A',
+'ǎ'=>'a','Ǐ'=>'I','ǐ'=>'i','Ǒ'=>'O','ǒ'=>'o','Ǔ'=>'U',
+'ǔ'=>'u','Ǖ'=>'U','ǖ'=>'u','Ǘ'=>'U','ǘ'=>'u','Ǚ'=>'U',
+'ǚ'=>'u','Ǜ'=>'U','ǜ'=>'u','ǝ'=>'e','Ǟ'=>'A','ǟ'=>'a',
+'Ǡ'=>'A','ǡ'=>'a','Ǣ'=>'AE','ǣ'=>'ae','Ǥ'=>'G','ǥ'=>'g',
+'Ǧ'=>'G','ǧ'=>'g','Ǩ'=>'K','ǩ'=>'k','Ǫ'=>'O','ǫ'=>'o',
+'Ǭ'=>'O','ǭ'=>'o','Ǯ'=>'EZH','ǯ'=>'ezh','ǰ'=>'j','DZ'=>'DZ',
+'Dz'=>'Dz','dz'=>'dz','Ǵ'=>'G','ǵ'=>'g','Ƕ'=>'HW','Ƿ'=>'W',
+'Ǹ'=>'N','ǹ'=>'n','Ǻ'=>'A','ǻ'=>'a','Ǽ'=>'AE','ǽ'=>'ae',
+'Ǿ'=>'O','ǿ'=>'o','Ȁ'=>'A','ȁ'=>'a','Ȃ'=>'A','ȃ'=>'a',
+'Ȅ'=>'E','ȅ'=>'e','Ȇ'=>'E','ȇ'=>'e','Ȉ'=>'I','ȉ'=>'i',
+'Ȋ'=>'I','ȋ'=>'i','Ȍ'=>'O','ȍ'=>'o','Ȏ'=>'O','ȏ'=>'o',
+'Ȑ'=>'R','ȑ'=>'r','Ȓ'=>'R','ȓ'=>'r','Ȕ'=>'U','ȕ'=>'u',
+'Ȗ'=>'U','ȗ'=>'u','Ș'=>'S','ș'=>'s','Ț'=>'T','ț'=>'t',
+'Ȝ'=>'Y','ȝ'=>'y','Ȟ'=>'H','ȟ'=>'h','Ƞ'=>'n','ȡ'=>'d',
+'Ȣ'=>'OU','ȣ'=>'ou','Ȥ'=>'Z','ȥ'=>'z','Ȧ'=>'A','ȧ'=>'a',
+'Ȩ'=>'E','ȩ'=>'e','Ȫ'=>'O','ȫ'=>'o','Ȭ'=>'O','ȭ'=>'o',
+'Ȯ'=>'O','ȯ'=>'o','Ȱ'=>'O','ȱ'=>'o','Ȳ'=>'Y','ȳ'=>'y',
+'ȴ'=>'l','ȵ'=>'n','ȶ'=>'t','ȷ'=>'j','ȸ'=>'db','ȹ'=>'qp',
+'Ⱥ'=>'A','Ȼ'=>'C','ȼ'=>'c','Ƚ'=>'L','Ⱦ'=>'T','ȿ'=>'s',
+'ɀ'=>'z','Ɂ'=>'-',
+// latin extended additional
+'Ḁ'=>'A','ḁ'=>'a',
+'Ḃ'=>'B','ḃ'=>'b','Ḅ'=>'B','ḅ'=>'b','Ḇ'=>'B','ḇ'=>'b',
+'Ḉ'=>'C','ḉ'=>'c',
+'Ḋ'=>'D','ḋ'=>'d','Ḍ'=>'D','ḍ'=>'d','Ḏ'=>'D','ḏ'=>'d','Ḑ'=>'D','ḑ'=>'d','Ḓ'=>'D','ḓ'=>'d',
+'Ḕ'=>'E','ḕ'=>'e','Ḗ'=>'E','ḗ'=>'e','Ḙ'=>'E','ḙ'=>'e','Ḛ'=>'E','ḛ'=>'e','Ḝ'=>'E','ḝ'=>'e',
+'Ḟ'=>'F','ḟ'=>'f',
+'Ḡ'=>'G','ḡ'=>'g',
+'Ḣ'=>'H','ḣ'=>'h','Ḥ'=>'H','ḥ'=>'h','Ḧ'=>'H','ḧ'=>'h','Ḩ'=>'H','ḩ'=>'h','Ḫ'=>'H','ḫ'=>'h',
+'Ḭ'=>'I','ḭ'=>'i','Ḯ'=>'I','ḯ'=>'i',
+'Ḱ'=>'K','ḱ'=>'k','Ḳ'=>'K','ḳ'=>'k','Ḵ'=>'K','ḵ'=>'k',
+'Ḷ'=>'L','ḷ'=>'l','Ḹ'=>'L','ḹ'=>'l','Ḻ'=>'L','ḻ'=>'l','Ḽ'=>'L','ḽ'=>'l',
+'Ḿ'=>'M','ḿ'=>'m','Ṁ'=>'M','ṁ'=>'m','Ṃ'=>'M','ṃ'=>'m',
+'Ṅ'=>'N','ṅ'=>'n','Ṇ'=>'N','ṇ'=>'n','Ṉ'=>'N','ṉ'=>'n','Ṋ'=>'N','ṋ'=>'n',
+'Ṍ'=>'O','ṍ'=>'o','Ṏ'=>'O','ṏ'=>'o','Ṑ'=>'O','ṑ'=>'o','Ṓ'=>'O','ṓ'=>'o',
+'Ṕ'=>'P','ṕ'=>'p','Ṗ'=>'P','ṗ'=>'p',
+'Ṙ'=>'R','ṙ'=>'r','Ṛ'=>'R','ṛ'=>'r','Ṝ'=>'R','ṝ'=>'r','Ṟ'=>'R','ṟ'=>'r',
+'Ṡ'=>'S','ṡ'=>'s','Ṣ'=>'S','ṣ'=>'s','Ṥ'=>'S','ṥ'=>'s','Ṧ'=>'S','ṧ'=>'s','Ṩ'=>'S','ṩ'=>'s',
+'Ṫ'=>'T','ṫ'=>'t','Ṭ'=>'T','ṭ'=>'t','Ṯ'=>'T','ṯ'=>'t','Ṱ'=>'T','ṱ'=>'t',
+'Ṳ'=>'U','ṳ'=>'u','Ṵ'=>'U','ṵ'=>'u','Ṷ'=>'U','ṷ'=>'u','Ṹ'=>'U','ṹ'=>'u','Ṻ'=>'U','ṻ'=>'u',
+'Ṽ'=>'V','ṽ'=>'v','Ṿ'=>'V','ṿ'=>'v',
+'Ẁ'=>'W','ẁ'=>'w','Ẃ'=>'W','ẃ'=>'w','Ẅ'=>'W','ẅ'=>'w','Ẇ'=>'W','ẇ'=>'w','Ẉ'=>'W','ẉ'=>'w',
+'Ẋ'=>'X','ẋ'=>'x','Ẍ'=>'X','ẍ'=>'x',
+'Ẏ'=>'Y','ẏ'=>'y',
+'Ẑ'=>'Z','ẑ'=>'z','Ẓ'=>'Z','ẓ'=>'z','Ẕ'=>'Z','ẕ'=>'z',
+'ẖ'=>'h',
+'ẗ'=>'t',
+'ẘ'=>'w',
+'ẙ'=>'y',
+'ẚ'=>'a',
+'ẛ'=>'f',
+'Ạ'=>'A','ạ'=>'a','Ả'=>'A','ả'=>'a','Ấ'=>'A','ấ'=>'a','Ầ'=>'A','ầ'=>'a','Ẩ'=>'A','ẩ'=>'a',
+'Ẫ'=>'A','ẫ'=>'a','Ậ'=>'A','ậ'=>'a','Ắ'=>'A','ắ'=>'a','Ằ'=>'A','ằ'=>'a','Ẳ'=>'A','ẳ'=>'a','Ẵ'=>'A','ẵ'=>'a','Ặ'=>'A','ặ'=>'a',
+'Ẹ'=>'E','ẹ'=>'e','Ẻ'=>'E','ẻ'=>'e','Ẽ'=>'E','ẽ'=>'e','Ế'=>'E','ế'=>'e','Ề'=>'E','ề'=>'e','Ể'=>'E','ể'=>'e','Ễ'=>'E','ễ'=>'e','Ệ'=>'E','ệ'=>'e',
+'Ỉ'=>'I','ỉ'=>'i','Ị'=>'I','ị'=>'i',
+'Ọ'=>'O','ọ'=>'o','Ỏ'=>'O','ỏ'=>'o','Ố'=>'O','ố'=>'o','Ồ'=>'O','ồ'=>'o','Ổ'=>'O','ổ'=>'o','Ỗ'=>'O','ỗ'=>'o',
+'Ộ'=>'O','ộ'=>'o','Ớ'=>'O','ớ'=>'o','Ờ'=>'O','ờ'=>'o','Ở'=>'O','ở'=>'o','Ỡ'=>'O','ỡ'=>'o','Ợ'=>'O','ợ'=>'o',
+'Ụ'=>'U','ụ'=>'u','Ủ'=>'U','ủ'=>'u','Ứ'=>'U','ứ'=>'u','Ừ'=>'U','ừ'=>'u','Ử'=>'U','ử'=>'u','Ữ'=>'U','ữ'=>'u','Ự'=>'U','ự'=>'u',
+'Ỳ'=>'Y','ỳ'=>'y','Ỵ'=>'Y','ỵ'=>'y','Ỷ'=>'Y','ỷ'=>'y','Ỹ'=>'Y','ỹ'=>'y',
+
+//### CYRILLIC (transliteration following iso 9:1995)
+'А'=>'A','а'=>'a', // A
+'Ӑ'=>'A','ӑ'=>'a', // A WITH BREVE
+'Ӓ'=>'A','ӓ'=>'a', // A WITH DIAERESIS
+'Ӕ'=>'A','ӕ'=>'a', // LIGATURE A IE
+'Ә'=>'A','ә'=>'a', // SCHWA
+'Ӛ'=>'A','ӛ'=>'a', // SCHWA WITH DIAERESIS
+'Б'=>'B','б'=>'b', // BE
+'В'=>'V','в'=>'v', // VE
+'Г'=>'G','г'=>'g', // GHE
+'Ґ'=>'G','ґ'=>'g', // GHE WITH UPTURN
+'Ҕ'=>'G','ҕ'=>'g', // GHE WITH MIDDLE HOOK
+'Ғ'=>'G','ғ'=>'g', // GHE WITH STROKE
+'Ӷ'=>'G','ӷ'=>'g', // GHE WITH DESCENDER
+'Д'=>'D','д'=>'d', // DE
+'Ђ'=>'D','ђ'=>'d', // DJE
+'Ѓ'=>'G','ѓ'=>'g', // GJE
+'Ѐ'=>'E','ѐ'=>'e', // IE WITH GRAVE
+'Е'=>'E','е'=>'e', // IE
+'Ё'=>'E','ё'=>'e', // IO
+'Ӗ'=>'E','ӗ'=>'e', // IE WITH BREVE
+'Є'=>'E','є'=>'e', // UKRAINIAN IE
+'Ҽ'=>'C','ҽ'=>'c', // ABKHASIAN CHE
+'Ҿ'=>'C','ҿ'=>'c', // ABKHASIAN CHE WITH DESCENDER
+'Ж'=>'Z','ж'=>'z', // ZHE
+'Ӂ'=>'Z','ӂ'=>'z', // ZHE WITH BREVE
+'Ӝ'=>'Z','ӝ'=>'z', // ZHE WITH DIAERESIS
+'Җ'=>'Z','җ'=>'z', // ZHE WITH DESCENDER
+'З'=>'Z','з'=>'z', // ZE
+'Ӟ'=>'Z','ӟ'=>'z', // ZE WITH DIAERESIS
+'Ѕ'=>'Z','ѕ'=>'z', // DZE
+'Ӡ'=>'Z','ӡ'=>'z', // ABKHASIAN DZE
+'Ѝ'=>'I','ѝ'=>'i', // I WITH GRAVE
+'И'=>'I','и'=>'i', // I
+'Ӣ'=>'I','ӣ'=>'i', // I WITH MACRON
+'Ӥ'=>'I','ӥ'=>'i', // I WITH DIAERESIS
+'І'=>'I','і'=>'i', // BYELORUSSIAN-UKRAINIAN I
+'Ї'=>'I','ї'=>'i', // YI
+'Й'=>'J','й'=>'j', // SHORT I
+'Ј'=>'J','ј'=>'j', // JE
+'К'=>'K','к'=>'k', // KA
+'Қ'=>'K','қ'=>'k', // KA WITH DESCENDER
+'Ҝ'=>'K','ҝ'=>'k', // KA WITH VERTICAL STROKE
+'Ҟ'=>'K','ҟ'=>'k', // KA WITH STROKE
+'Ҡ'=>'K','ҡ'=>'k', // BASHKIR KA
+'Л'=>'L','л'=>'l', // EL
+'Љ'=>'L','љ'=>'l', // LJE
+'М'=>'M','м'=>'m', // EM
+'Н'=>'N','н'=>'n', // EN
+'Њ'=>'N','њ'=>'n', // NJE
+'Ҥ'=>'N','ҥ'=>'n', // LIGATURE EN GHE
+'Ң'=>'N','ң'=>'n', // EN WITH DESCENDER
+'О'=>'O','о'=>'o', // O
+'Ӧ'=>'O','ӧ'=>'o', // O WITH DIAERESIS
+'Ө'=>'O','ө'=>'o', // BARRED O
+'Ӫ'=>'O','ӫ'=>'o', // BARRED O WITH DIAERESIS
+'П'=>'P','п'=>'p', // PE
+'Ҧ'=>'P','ҧ'=>'p', // PE WITH MIDDLE HOOK
+'Р'=>'R','р'=>'r', // ER
+'С'=>'S','с'=>'s', // ES
+'Ҫ'=>'C','ҫ'=>'c', // ES WITH DESCENDER
+'Т'=>'T','т'=>'t', // TE
+'Ҭ'=>'T','ҭ'=>'t', // TE WITH DESCENDER
+'Ћ'=>'C','ћ'=>'c', // TSHE
+'Ќ'=>'K','ќ'=>'k', // KJE
+'У'=>'U','у'=>'u', // U
+'Ў'=>'U','ў'=>'u', // SHORT U
+'Ӯ'=>'U','ӯ'=>'u', // U WITH MACRON
+'Ӱ'=>'U','ӱ'=>'u', // U WITH DIAERESIS
+'Ӳ'=>'U','ӳ'=>'u', // U WITH DOUBLE ACUTE
+'Ү'=>'U','ү'=>'u', // STRAIGHT U
+'Ұ'=>'U','ұ'=>'u', // STRAIGHT U WITH STROKE
+'Ф'=>'F','ф'=>'f', // EF
+'Х'=>'H','х'=>'h', // HA
+'Ҳ'=>'H','ҳ'=>'h', // HA WITH DESCENDER
+'Һ'=>'H','һ'=>'h', // SHHA
+'Ц'=>'C','ц'=>'c', // TSE
+'Ҵ'=>'C','ҵ'=>'c', // LIGATURE TE TSE
+'Ч'=>'C','ч'=>'c', // CHE
+'Ӵ'=>'C','ӵ'=>'c', // CHE WITH DIAERESIS
+'Ҷ'=>'C','ҷ'=>'c', // CHE WITH DESCENDER
+'Ҹ'=>'C','ҹ'=>'c', // CHE WITH VERTICAL STROKE
+'Џ'=>'D','џ'=>'d', // DZHE
+'Ш'=>'S','ш'=>'s', // SHA
+'Щ'=>'S','щ'=>'s', // SHCHA
+'Ы'=>'Y','ы'=>'y', // YERU
+'Ӹ'=>'Y','ӹ'=>'y', // YERU WITH DIAERESIS
+'Э'=>'E','э'=>'e', // E
+'Ӭ'=>'E','ӭ'=>'e', // E WITH DIAERESIS
+'Ю'=>'U','ю'=>'u', // YU
+'Я'=>'A','я'=>'a', // YA
+'Ѣ'=>'E','ѣ'=>'e', // YAT
+'Ѫ'=>'A','ѫ'=>'a', // BIG YUS
+'Ѳ'=>'F','ѳ'=>'f', // FITA
+'Ѵ'=>'Y','ѵ'=>'y', // IZHITSA
+'Ѷ'=>'Y','ѷ'=>'y', // IZHITSA WITH DOUBLE GRAVE ACCENT
+'Ҩ'=>'O','ҩ'=>'o', // ABKHASIAN HA
+'Ѡ'=>'O','ѡ'=>'o', // OMEGA
+'Ѥ'=>'E','ѥ'=>'e', // IOTIFIED E
+'Ѧ'=>'U','ѧ'=>'u', // LITTLE YUS (???)
+'Ѩ'=>'U','ѩ'=>'u', // IOTIFIED LITTLE YUS (???)
+'Ѭ'=>'U','ѭ'=>'u', // IOTIFIED BIG YUS (???)
+'Ѯ'=>'K','ѯ'=>'k', // KSI (???)
+'Ѱ'=>'P','ѱ'=>'p', // PSI (???)
+'Ѹ'=>'U','ѹ'=>'u', // UK
+'Ѻ'=>'O','ѻ'=>'o', // ROUND OMEGA (???)
+'Ѽ'=>'O','ѽ'=>'o', // OMEGA WITH TITLO (???)
+'Ѿ'=>'O','ѿ'=>'o', // OT (???)
+'Ҁ'=>'K','ҁ'=>'k', // KOPPA (???)
+'Ҋ'=>'J','ҋ'=>'j', // SHORT I WITH TAIL
+'Ҏ'=>'R','Ҏ'=>'r', // ER WITH TICK
+'Ҙ'=>'Z','ҙ'=>'z', // ZE WITH DESCENDER
+'Ӄ'=>'K','ӄ'=>'k', // KA WITH HOOK
+'Ӆ'=>'L','ӆ'=>'l', // EL WITH TAIL
+'Ӈ'=>'N','ӈ'=>'n', // EN WITH HOOK
+'Ӊ'=>'N','ӊ'=>'n', // EN WITH TAIL
+'Ӌ'=>'C','ӌ'=>'c', // KHAKASSIAN CHE
+'Ӎ'=>'M','ӎ'=>'m', // EM WITH TAIL
+// specialchars
+'ъ'=>'-','Ъ'=>'-', // HARD SIGN
+'Ь'=>'-','ь'=>'-', // SOFT SIGN
+'Ҍ'=>'-', // SEMISOFT SIGN
+'Ӏ'=>'-', // PALOCHKA
+'́'=>'',
+
+//### (new) GREEK (transcription following wikipedia: http://de.wikipedia.org/w/index.php?title=Wikipedia:Namenskonventionen/Neugriechisch&oldid=29601735 )
+// groups of two chars
+'αι'=>'e','Αι'=>'E',
+'ει'=>'i','Ει'=>'I',
+'οι'=>'i','Οι'=>'I',
+'ου'=>'ou','Ου'=>'Ou',
+'αυ'=>'av','Αυ'=>'Av',
+'ευ'=>'ev','Ευ'=>'Ev',
+'ηυ'=>'iv','Ηυ'=>'Iv',
+'μπ'=>'mp','Μπ'=>'B',
+'ντ'=>'nt','Ντ'=>'D',
+'τζ'=>'tz','Τζ'=>'Tz',
+'γκ'=>'ng','Γκ'=>'G',
+'γγ'=>'ng','Γγ'=>'Ng',
+// single chars
+'Ά'=>'A','Έ'=>'E','Ή'=>'I','Ί'=>'I','Ό'=>'O','Ύ'=>'Y','Ώ'=>'O','ΐ'=>'i',
+'Α'=>'A','Β'=>'V','Γ'=>'G','Δ'=>'D','Ε'=>'E','Ζ'=>'Z','Η'=>'I','Θ'=>'Th','Ι'=>'I','Κ'=>'K','Λ'=>'L','Μ'=>'M','Ν'=>'N','Ξ'=>'X','Ο'=>'O','Π'=>'P','Ρ'=>'R','Σ'=>'S','Τ'=>'T','Υ'=>'Y','Φ'=>'F','Χ'=>'Ch','Ψ'=>'Ps','Ω'=>'O',
+'Ϊ'=>'I','Ϋ'=>'Y','ά'=>'a','έ'=>'e','ή'=>'i','ί'=>'i','ΰ'=>'y',
+'α'=>'a','β'=>'v','γ'=>'g','δ'=>'d','ε'=>'e','ζ'=>'z','η'=>'i','θ'=>'th','ι'=>'i','κ'=>'k','λ'=>'l','μ'=>'m','ν'=>'n','ξ'=>'x','ο'=>'o','π'=>'p','ρ'=>'r','ς'=>'s','σ'=>'s','τ'=>'t','υ'=>'y','φ'=>'f','χ'=>'ch','ψ'=>'ps','ω'=>'o',
+'ϊ'=>'i','ϋ'=>'y','ό'=>'o','ύ'=>'y','ώ'=>'o','ϐ'=>'b','ϑ'=>'th','ϒ'=>'y','ϓ'=>'y','ϔ'=>'y'
+
);
?>
\ No newline at end of file
Index: branches/2.6.x/wb/framework/class.frontend.php
===================================================================
--- branches/2.6.x/wb/framework/class.frontend.php (revision 451)
+++ branches/2.6.x/wb/framework/class.frontend.php (revision 452)
@@ -1,387 +1,388 @@
-
- Copyright (C) 2004-2007, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker 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. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-/*
-
-Frontend class
-
-*/
-
-if(!defined('WB_PATH')) {
- header('Location: ../index.php');
- exit(0);
-}
-
-
-require_once(WB_PATH.'/framework/class.wb.php');
-
-class frontend extends wb {
- // defaults
- var $default_link,$default_page_id;
- // when multiple blocks are used, show home page blocks on
- // pages where no content is defined (search, login, ...)
- var $default_block_content=true;
-
- // page details
- // page database row
- var $page;
- var $page_id,$page_title,$menu_title,$parent,$root_parent,$level,$visibility;
- var $page_description,$page_keywords,$page_link;
- var $page_trail=array();
-
- var $page_access_denied;
-
- // website settings
- var $website_title,$website_description,$website_keywords,$website_header,$website_footer;
-
- // ugly database stuff
- var $extra_where_sql, $sql_where_language;
-
- function page_select() {
- global $page_id,$no_intro;
- global $database;
- // We have no page id and are supposed to show the intro page
- if((INTRO_PAGE AND !isset($no_intro)) AND (!isset($page_id) OR !is_numeric($page_id))) {
- // Since we have no page id check if we should go to intro page or default page
- // Get intro page content
- $filename = WB_PATH.PAGES_DIRECTORY.'/intro.php';
- if(file_exists($filename)) {
- $handle = fopen($filename, "r");
- $content = fread($handle, filesize($filename));
- fclose($handle);
- $this->preprocess($content);
- echo ($content);
- return false;
- }
- }
- // Check if we should add page language sql code
- if(PAGE_LANGUAGES) {
- $this->sql_where_language = " AND language = '".LANGUAGE."'";
- }
- // Get default page
- // Check for a page id
- $query_default = "SELECT page_id,link FROM ".TABLE_PREFIX."pages WHERE parent = '0' AND visibility = 'public'$this->sql_where_language ORDER BY position ASC LIMIT 1";
- $get_default = $database->query($query_default);
- $default_num_rows = $get_default->numRows();
- if(!isset($page_id) OR !is_numeric($page_id)){
- // Go to or show default page
- if($default_num_rows > 0) {
- $fetch_default = $get_default->fetchRow();
- $this->default_link = $fetch_default['link'];
- $this->default_page_id = $fetch_default['page_id'];
- // Check if we should redirect or include page inline
- if(HOMEPAGE_REDIRECTION) {
- // Redirect to page
- header("Location: ".$this->page_link($this->default_link));
- exit();
- } else {
- // Include page inline
- $this->page_id = $this->default_page_id;
- }
- } else {
- // No pages have been added, so print under construction page
- $this->print_under_construction();
- exit();
- }
- } else {
- $this->page_id=$page_id;
- }
- // Get default page link
- if(!isset($fetch_default)) {
- $fetch_default = $get_default->fetchRow();
- $this->default_link = $fetch_default['link'];
- $this->default_page_id = $fetch_default['page_id'];
- }
- return true;
- }
-
- function get_page_details() {
- global $database;
- if($this->page_id != 0) {
- // Query page details
- $query_page = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '{$this->page_id}'";
- $get_page = $database->query($query_page);
- // Make sure page was found in database
- if($get_page->numRows() == 0) {
- // Print page not found message
- exit("Page not found");
- }
- // Fetch page details
- $this->page = $get_page->fetchRow();
- // Check if the page language is also the selected language. If not, send headers again.
- if ($this->page['language']!=LANGUAGE) {
- header('Location: '.$this->page_link($this->page['link']).'?lang='.$this->page['language']);
- exit();
- }
- // Begin code to set details as either variables of constants
- // Page ID
- define('PAGE_ID', $this->page['page_id']);
- // Page Title
- define('PAGE_TITLE', htmlentities(($this->page['page_title'])));
- $this->page_title=PAGE_TITLE;
- // Menu Title
- $menu_title = htmlentities($this->page['menu_title']);
- if($menu_title != '') {
- define('MENU_TITLE', $menu_title);
- } else {
- define('MENU_TITLE', PAGE_TITLE);
- }
- $this->menu_title=MENU_TITLE;
- // Page parent
- define('PARENT', $this->page['parent']);
- $this->parent=$this->page['parent'];
- // Page root parent
- define('ROOT_PARENT', $this->page['root_parent']);
- $this->root_parent=$this->page['root_parent'];
- // Page level
- define('LEVEL', $this->page['level']);
- $this->level=$this->page['level'];
- // Page visibility
- define('VISIBILITY', $this->page['visibility']);
- $this->visibility=$this->page['visibility'];
- // Page trail
- foreach(explode(',', $this->page['page_trail']) AS $pid) {
- $this->page_trail[$pid]=$pid;
- }
- // Page description
- $this->page_description=$this->page['description'];
- if($this->page_description != '') {
- define('PAGE_DESCRIPTION', $this->page_description);
- } else {
- define('PAGE_DESCRIPTION', WEBSITE_DESCRIPTION);
- }
- // Page keywords
- $this->page_keywords=$this->page['keywords'];
- // Page link
- $this->link=$this->page_link($this->page['link']);
-
- // End code to set details as either variables of constants
- }
-
- // Figure out what template to use
- if(!defined('TEMPLATE')) {
- if(isset($this->page['template']) AND $this->page['template'] != '') {
- if(file_exists(WB_PATH.'/templates/'.$this->page['template'].'/index.php')) {
- define('TEMPLATE', $this->page['template']);
- } else {
- define('TEMPLATE', DEFAULT_TEMPLATE);
- }
- } else {
- define('TEMPLATE', DEFAULT_TEMPLATE);
- }
- }
- // Set the template dir
- define('TEMPLATE_DIR', WB_URL.'/templates/'.TEMPLATE);
-
- // Check if user is allowed to view this page
- if(VISIBILITY == 'private' OR VISIBILITY == 'registered') {
- // Check if the user is authenticated
- if($this->is_authenticated() == false) {
- // User needs to login first
- header("Location: ".WB_URL."/account/login".PAGE_EXTENSION.'?redirect='.$this->link);
- exit(0);
- }
- // Check if we should show this page
- if($this->show_page($this->page) == false) {
- $this->page_access_denied=true;
- }
- } elseif(VISIBILITY == 'deleted' OR VISIBILITY == 'none') {
- // User isnt allowed on this page so tell them
- $this->page_access_denied=true;
- }
- }
-
- function get_website_settings() {
- global $database;
-
- // set visibility SQL code
- // never show no-vis, hidden or deleted pages
- $this->extra_where_sql = "visibility != 'none' AND visibility != 'hidden' AND visibility != 'deleted'";
- // Set extra private sql code
- if($this->is_authenticated()==false) {
- // if user is not authenticated, don't show private pages either
- $this->extra_where_sql .= " AND visibility != 'private'";
- // and 'registered' without frontend login doesn't make much sense!
- if (FRONTEND_LOGIN==false) {
- $this->extra_where_sql .= " AND visibility != 'registered'";
- }
- }
- $this->extra_where_sql .= $this->sql_where_language;
-
- // Work-out if any possible in-line search boxes should be shown
- if(SEARCH == 'public') {
- define('SHOW_SEARCH', true);
- } elseif(SEARCH == 'private' AND VISIBILITY == 'private') {
- define('SHOW_SEARCH', true);
- } elseif(SEARCH == 'private' AND $wb->is_authenticated() == true) {
- define('SHOW_SEARCH', true);
- } else {
- define('SHOW_SEARCH', false);
- }
- // Work-out if menu should be shown
- if(!defined('SHOW_MENU')) {
- define('SHOW_MENU', true);
- }
- // Work-out if login menu constants should be set
- if(FRONTEND_LOGIN) {
- // Set login menu constants
- define('LOGIN_URL', WB_URL.'/account/login'.PAGE_EXTENSION);
- define('LOGOUT_URL', WB_URL.'/account/logout'.PAGE_EXTENSION);
- define('FORGOT_URL', WB_URL.'/account/forgot'.PAGE_EXTENSION);
- define('PREFERENCES_URL', WB_URL.'/account/preferences'.PAGE_EXTENSION);
- define('SIGNUP_URL', WB_URL.'/account/signup'.PAGE_EXTENSION);
- }
- }
-
- function preprocess(&$content) {
- global $database;
- // Replace [wblink--PAGE_ID--] with real link
- $pattern = '/\[wblink(.+?)\]/s';
- preg_match_all($pattern,$content,$ids);
- foreach($ids[1] AS $page_id) {
- $pattern = '/\[wblink'.$page_id.'\]/s';
- // Get page link
- $get_link = $database->query("SELECT link FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id' LIMIT 1");
- $fetch_link = $get_link->fetchRow();
- $link = $this->page_link($fetch_link['link']);
- $content = preg_replace($pattern,$link,$content);
- }
- }
-
- function menu() {
- global $wb;
- if (!isset($wb->menu_number)) {
- $wb->menu_number = 1;
- }
- if (!isset($wb->menu_start_level)) {
- $wb->menu_start_level = 0;
- }
- if (!isset($wb->menu_recurse)) {
- $wb->menu_recurse = -1;
- }
- if (!isset($wb->menu_collapse)) {
- $wb->menu_collapse = true;
- }
- if (!isset($wb->menu_item_template)) {
- $wb->menu_item_template = '[a] [menu_title] [/a]';
- }
- if (!isset($wb->menu_item_footer)) {
- $wb->menu_item_footer = '';
- }
- if (!isset($wb->menu_header)) {
- $wb->menu_header = '';
- }
- if (!isset($wb->menu_footer)) {
- $wb->menu_footer = ' ';
- }
- if (!isset($wb->menu_default_class)) {
- $wb->menu_default_class = ' class="menu_default"';
- }
- if (!isset($wb->menu_current_class)) {
- $wb->menu_current_class = ' class="menu_current"';
- }
- if (!isset($wb->menu_parent)) {
- $wb->menu_parent = 0;
- }
- $wb->show_menu();
- }
-
- function show_menu() {
- global $database;
- if ($this->menu_start_level>0) {
- $key_array=array_keys($this->page_trail);
- if (isset($key_array[$this->menu_start_level-1])) {
- $real_start=$key_array[$this->menu_start_level-1];
- $this->menu_parent=$real_start;
- $this->menu_start_level=0;
- } else {
- return;
- }
- }
- if ($this->menu_recurse==0)
- return;
- // Check if we should add menu number check to query
- if($this->menu_parent == 0) {
- $menu_number = "menu = '$this->menu_number'";
- } else {
- $menu_number = '1';
- }
- // Query pages
- $query_menu = $database->query("SELECT page_id,menu_title,page_title,link,target,level,visibility FROM ".
- TABLE_PREFIX."pages WHERE parent = '$this->menu_parent' AND $menu_number AND $this->extra_where_sql ORDER BY position ASC");
- // Check if there are any pages to show
- if($query_menu->numRows() > 0) {
- // Print menu header
- echo "\n".$this->menu_header;
- // Loop through pages
- while($page = $query_menu->fetchRow()) {
- // Check if this page should be shown
- // Create vars
- $vars = array('[class]','[a]', '[/a]', '[menu_title]', '[page_title]');
- // Work-out class
- if($page['page_id'] == PAGE_ID) {
- $class = $this->menu_current_class;
- } else {
- $class = $this->menu_default_class;
- }
- // Check if link is same as first page link, and if so change to WB URL
- if($page['link'] == $this->default_link AND !INTRO_PAGE) {
- $link = WB_URL;
- } else {
- $link = $this->page_link($page['link']);
- }
- // Create values
- $values = array($class,'', '', htmlentities($page['menu_title']), htmlentities($page['page_title']));
- // Replace vars with value and print
- echo "\n".str_replace($vars, $values, $this->menu_item_template);
- // Generate sub-menu
- if($this->menu_collapse==false OR ($this->menu_collapse==true AND isset($this->page_trail[$page['page_id']]))) {
- $this->menu_recurse--;
- $this->menu_parent=$page['page_id'];
- $this->show_menu();
- }
- echo "\n".$this->menu_item_footer;
- }
- // Print menu footer
- echo "\n".$this->menu_footer;
- }
- }
-
-
- // Function to show the "Under Construction" page
- function print_under_construction() {
- global $MESSAGE;
- require_once(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php');
- echo '
- '.$MESSAGE['GENERIC']['WEBSITE_UNDER_CONSTRUCTION'].'
-
- '.$MESSAGE['GENERIC']['WEBSITE_UNDER_CONSTRUCTION'].'
- '.$MESSAGE['GENERIC']['PLEASE_CHECK_BACK_SOON'].' |