Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG (revision 432)
+++ trunk/CHANGELOG (revision 433)
@@ -32,6 +32,8 @@
27-Dec-2006 Matthias Gallas
# Fixed form modul stores empty records
------------------------------------- 2.6.6 -------------------------------------
+16-Feb-2007 Christian Sommer
+# Applied fix to enable parsing of PHP code in the intro.php
30-Jan-2007 Ryan Djurovich
# Applied fix for ticket #376
------------------------------------- 2.6.5 -------------------------------------
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php (revision 432)
+++ trunk/wb/framework/class.frontend.php (revision 433)
@@ -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'].'