/ - Diff - WB 2.08.x - Tracking

« Previous | Next »

Revision 509

Added by ryan over 18 years ago

Created 2.6.6 tag

     Change Log
     ===============================================================================
     Please note: This change log may not be accurate
     $Id$
     Legend:
     + = Added
     - = Removed
     # = Bugfix
     ! = Update/Change
     ------------------------------------- 2.6.6 -------------------------------------
 -Jul-2007 Matthias Gallas
     #	Fixed converting issue with some ISO-charsets and speeded up converting on large pages (thanks to Thorn)
 -Jul-2007 Ryan Djurovich
     #	Fixed bug where error message not displayed when script fails to create a page
     #	Fixed bugs introduced in [484]
 -May-2007 Matthias Gallas
     +	Added support for ISO-8859-6.(Thanks to thorn)
 -May-2007 Christian Sommer
     +	Replaced functions page_css and page_javascript by register_frontend_modfiles
     +	Added function register_backend_modfiles to allow backend modules to use optional CSS and JS files
     +	Added the JS framework codepress to allow syntax highlighting for JS, HTML, PHP code (textarea)
     +	Added the new function register_frontend_modfiles to the built in templates
 -May-2007 Matthias Gallas
     +	Added wrapper to functions.php if mb_string is not available (Thanks to thorn)
     +	Added new functions page_css and page_javascript to the built in templates
     +	Added search highlight class to css files of the built in templates
 -Apr-2007 Matthias Gallas
     #	Fixed ticket #392; root_parent not being set correctly (Thanks to eggsurplus)
 -Apr-2007 Matthias Gallas
     +	Optimized search and highlighting funktions (Thanks to thorn)
 -Apr-2007 Matthias Gallas
     #	Fixed a bug in menulink; if you deleted a menulink page the linked page was also deleted
     	in the pages directory (Special thanks to "Funky_MF" for the fix)
 -Apr-2007 Matthias Gallas
     #	Fixed issues with some languages when UTF8 is used. Removed all htmlentites
     	from the code (revoked changeset 396) and added new functions instead. Adapted the
     	search and the highlighting to use the new functions. With this changes WB can now
     	be used with charset UTF8 for all languages. Very special thanks to Thorn who wrote
     	and tested this changes.
 -Mar-2007 Matthias Gallas
     +	Added multilingual support to search
 -Mar-2007 Matthias Gallas
     +	Added new function for highlighting search results in the content area
     	(Special thanks to "thorn" and "Funky_MF")
     #	Fixed some issues in search with special chars
     	(Special thanks to "thorn" and "Funky_MF")
 -Feb-2007 Christian Sommer
     #	Fixed bug in changeset 428 (page files were not deleted in /pages folder due to a typo in wb/framework/function.php)
 -Feb-2007 Christian Sommer
     !	Suppressed PHP warnings and errors when reading empty intro.php
 -Feb-2007 Christian Sommer
     #	Applied fix to enable parsing of PHP code in the intro.php
 -Feb-2007 Christian Sommer
     !	Added functions page_css and page_javascript which allow to include optional
     	module files module.css and module.js into the <head> section. This allows to
     	create valid (X)HTML, as CSS definitions of modules are included in the head section
 -Feb-2007 Christian Sommer
     !	Security enhancement (reduced number of login trials from 50 to 3)
 -Feb-2007 Matthias Gallas
     #	Applied fix for ticket #380 (Thanks to pcwacht)
 -Jan-2007 Ryan Djurovich
     #	Applied fix for ticket #376
 -Jan-2007 Matthias Gallas
     +	Added new variable $MODULE_DESCRIPTION wich allows to have optional a language
     	specific description of the modules in the language files of the modules.
 -Jan-2007 Matthias Gallas
     #	Fixed issue in the search table entries of form modul
 -Jan-2007 Matthias Gallas
     #	Fixed some bugs in rss.php
 -Jan-2007 Matthias Gallas
     #	Fixed error when uninstalling the news modul
 -Jan-2007 Matthias Gallas
     +   Added id keywords to all missing files
     #	Fixed issue with Permissions for pages sections
 -Dec-2006 Matthias Gallas
     #	Fixed form modul stores empty records
     ------------------------------------- 2.6.5 -------------------------------------
 -Dec-2006 Ryan Djurovich
     !	Changed links to WB help website
 -Dec-2006 Matthias Gallas
     #	Fixed some minor javascript errors in admin (thanks to pcwacht)
     #	Fixed root_parent doesn't get updated when moving item in menu (#305)
     !	Changed all copyright notices to include now 2007
 -Dec-2006 Matthias Gallas
     #	Fixed IE allows to set a page as parent of itself (#320)
     #	Fixed problem with Page Title has to be escaped (#287)
     #	Fixed the possibility to call the index.php of the templates directly in the browser (#291)
 -Dec-2006 Matthias Gallas
     #	Fixed missing message when adding a site without page title (#300)
 -Dec-2006 Ryan Djurovich
     #	Fixed bug with captcha script (#346)
 -Dec-2006 Matthias Gallas
     #	Fixed Return to Search Results Page (#365)
     !	Set Version to 2.6.5
     -	Removed Changeset 365 because this will be a part of WB 2.7.x
     #	Fixed a little typo error in class.admin.php (#364)
 -Nov-2006 Ryan Djurovich
     +	Added new script that could possibly be apart of 2.7.x as a replacement
     	for having the pages directory
 -Nov-2006 Matthias Gallas
     #	Fixed fatal error in line 46 news/comment.php (thanks to eki)(#358)
 -Nov-2006 Matthias Gallas
     #	Fixed again intropage doesn't work (#71)
 -Oct-2006 Matthias Gallas
     +	Added phpmailer class (thanks to doc)
     +	Added Remember-expanded-pages-in-admin (thanks to ephraimt)
     +	Added List sorting in admin area (thanks to rsmith)
     #	Fixed table width 100% are wrong displayed in container templates
     	when IE is used (#350)
     #	Fixed large space between menupoints in IE (#349)
     #	Fixed Website description is not displayed when no page description
     	available (#348)
     #	Fixed group images in news modul cannot be stored (#342)
     #	Fixed Typo in form/save_field.php (#341)
     #	Fixed files in /pages/posts folder are not deleted (#340)
     #	Fixed specialchars problem in the news modul (#339)
     #	Fixed news modul stores empty records (#338)
     #	Fixed Captcha didn't work in news comments (#337)
     #	Fixed various php notices (#334)
     +	Added new upgrade_function (thanks to kozmoz)
     #	Fixed addons table isn't updated when a modul is updated (#332)
     #	Fixed spelling errors in the signup2.php (#330)
     #	Fixed MySQL 5.x missing default values for INT fields in all system
     	and modules tables (#329)
     #	Fixed installer does not insert admin user (#328)
     +	Added support for getting page ID of page that referred search
     	request (#327) (thanks to brofield)
     #	Fixed search results generate invalid XHTML and notify warnings (#326)
     Stefan Braunewell
     #	Fixed Field 'last_reset' doesn't have a default value (#313)
     +	Added get_post_escaped to wb class which automatically calls add_slashes
     	on get_post output and used it in form/save_field.php
     ------------------------------------- 2.6.4 -------------------------------------
 -May-2006 Ryan Djurovich
     #	Fixed security issues related to #237
     #	Fixed typo in news save comment page (#282)
     #	Fixed typo in news delete post page (#283)
     !	Added multi-submission protection to form module (#119)
     #	Added notice for when PHP Session Support appears to be disabled in installer,
     	even if it is enabled and the problem actually lies in the users browser (#154)
 -May-2006 Ryan Djurovich
     #	Fixed problem in forgotten login form where email field is too short (#207)
     #	Fixed typo in forgotten login details email (#190)
 -May-2006 Stefan Braunewell
     #	Fixed security issues (#237)
 -May-2006 Stefan Braunewell
     #	Fixed problems with pre-2.6.0 modules in section list
     #	Fixed e-mail bug caused by From: headers in internal mail function calls
     	(#189)
     #	E-mail validation in install script now accepts new top-level domains
     	(#162)
     #	Error status is now overwritten by next database query (#182)
     #	Fixed obscure problem in htmlarea install script
     ------------------------------------- 2.6.3 -------------------------------------
 -Mar-2006 Stefan Braunewell
     #	Fixed ticket #146: problems removing groups from viewers list of a page
 -Mar-2006 Stefan Braunewell
     !	Changed link target selection. Now self, top and new. (Ticket #145)
     #	Fixed ticket #143. Charset setting is now used in admin login and forgot
     	password pages.
     #	Some changes to the SQL code in the install script for improved
     	compatibility with new MySQL versions
     #	Fixed ticket #134 - error on browsing media.
     +	Improved backup module: new choice between full database or WB-related
     	backup.
     #	Fixed ticket #141 - admin now sees all folders in media
     #	Fixed e-mail sending problems due to additional parameter in mail call.
     #	Applied fix regarding ticket #138: new users now get deleted if
     	sending e-mail fails.
     #	Fixed ticket #137: Last Reset timer not reset in frontend forgotten
     	password process
     #	Removed duplicate expression from modules/news/install.php which caused
     	problems in installation
 -Mar-2006 Stefan Braunewell
     #	Fixed ticket #68 - Safari problem with displaying all parents.
     #	Fixed ticket #136 - mailing forgotten password in admin login screen leads
     	to fatal error.
     !	Renamed tag [PROCESSTIME] to [PROCESS_TIME]
     ------------------------------------- 2.6.2 -------------------------------------
 -Feb-2006 Stefan Braunewell (very big special thanks to John and Alex)
     #	Fixed ticket #104 - commas in form field descriptions not allowed.
     #	Cookie REMEMBER_KEY wasn't cleared in account/logout
     	and expiration date is now set to time in the past.
     #	Smart login not working.
     !	Changed mail calls to new function $wb->mail.
     #	Form: ticket 124 added captcha settings check
     #	Ticket 118 added formfield type to check for email/text
     #	Ticket 115 changed comparision /modules/form/view.php
     #	Added correct timecheck in form submissions
     !	Changed captcha.php call to include timestamp
     !	Changed the e-mail validation code and added a mail function to class wb.
     !	Forgotten password: if sending of e-mail fails, restore old password.
     	Ticket #110
     !	Added more charset options. Ticket #102 - thanks to ruebenwurzel!
     !	Character encoding setting also affects admin backend.
     	Mentioned in ticket #102.
     !	Reintroduced page languages setting. If switched to off, page
     	languages are only used to determine the language file for the
     	universal texts. If on, displayed page and menu are affected by
     	the language session variable.
     #	Fixed bugs in show_breadcrumbs code and added parameter "depth"
     	to set the number of levels to be show.
     #	Fixed a bug where access settings of registered and private pages
     	were displayed incorrectly.
     #	Fixed captcha being cached.
     #	Added an exit call after every heading("Location:...")
     	redirector to prevent unwanted execution of code.
     #	Bug #122. Replaced empty field check by check that setting name is
     	not "wb_version".
     #	Replaced all remaining occurrences of '/media' by MEDIA_DIRECTORY - bug #108.
     #	Fixed bug #99 and two additional instances of typo
     	catpcha instead of captcha.
     #	Fixed some typos
     #	Fixed some notices and warnings.
     #	Fixed bug #105 - back buttons in addon detail pages not editable.
     !	Replace 'admin' by 'wb' in all account pages.
     !/#	Moved print_success and print_error code to class.wb.php.
     	Added correct parameters to these functions in account pages.
     ------------------------------------- 2.6.1 -------------------------------------
 -Dec-2005 Ryan Djurovich
     #	Fixed security vulnerability in class.login.php
     #	Fixed typo in EN language file
     #	Fixed captcha problems (when feature is disabled) in form module and sign-up
     !	Added charset encoding to admin templates
     !	Added extra code to check for selection of addon upon uninstalling
     #	Fixed bugs in RSS news feeder
     #	Fixed bug with PAGE_DESCRIPTION not being set on any page
     ------------------------------------- 2.6.0 -------------------------------------
 -Nov-2005 Ryan Djurovich
     +	Added default charset option to (advanced) settings
     #	Form module email fields now have email address validation
     #	Fixed spacing in form submissions
 -Nov-2005 Ryan Djurovich
     +	Added captcha verification to sign-up form
     +	Added Captcha to News module
 -Nov-2005 Stefan Braunewell
     !	Applied aportale's patch to use label instead of javascript toggle code
 -Nov-2005 Ryan Djurovich
     !	News mod now hides read more link if no need for it (see ticket #56)
     +	Added support for mailto: links in the menu link mod
     #	Added direct-access redirection on some files (see ticket #37)
     +	Added extra characters to convert.php (see ticket #64)
     #	Fixed ticket #65 (last_reset check in account/forgot_form.php)
 -Sep-2005 Ryan Djurovich
     !	Cleaned up form buttons in Settings
     !	Moved some options into Advanced Settings
     #	Semi-disabled "separate" page trash option
     +	Created a backup module/tool for backing-up the database
     	(thanks to John (pcwacht) for the original code)
     +	Created new "blank template", which can be used in case where you don't
     	want anything wrapping page-content.
 -Sep-2005 Ryan Djurovich
     +	Added _license field for all add-ons to specify a license
     !	Renamed _designed_for variables (for all addons) to _platform
     +	Created addons table for faster internal referencing of installed addons
     !	Fixed some links, including the "Help" button in Admin
     #	Used nl2br to display body correctly when viewing form-submissions
 -Sep-2005 Stefan Braunewell
     +	Added table module with columns 'name','type' and 'directory' as an
     	index.
     +	Added entry to settings table 'wb_version' which holds the version
     	number and can be utilized in future upgrade scripts.
     !	Added upgrade functionality also for templates and languages.
     #/!	Template/modules installation now respects paths.
     !	Moved updates from config.php to database.
     	Created initialize.php (required by config.php) to read settings.
 -Sep-2005 Stefan Braunewell
     !	HTMLArea is now a module instead of a core component. Files moved
     	from "include" to "modules".
     +	Implemented Installation of modules on top of an older version. This is
     	done via checking $module_version. Instead of install.php, upgrade.php
     	is then called if it exists in the module package.
     	For module developers: $module_version and $new_module_version are
     	accessible in upgrade.php to find out what upgrade steps need to be taken.
     !	Changed column names in mod_news_posts from short,long to content_short,
     	content_long.
 -Sep-2005 Stefan Braunewell
     +	Added new advanced setting "Rename Files On Upload". File extensions can be
     	given so that respective files will have a ".txt" appended on media upload.
     #	Fixed "None found" message bug when user has no top level page edit
     	rights.
     #	Fixed missing parent option 'none' - ticket #12 - and a minor scope bug.
     +	Added breadcrumbs code. Call using $wb->breadcrumbs().
     +	Added utf-8 character encoding meta tag into all stock templates.
     #	Fixed bug when changing a page's parent
     !	Changed the way blocks are treated. Added new frontend class attribute
     	default_block_content that controls what is shown on pages such as
     	search, login, etc. (Ticket #16)
     +	Added support for WYSIWYG editor modules (wysiwygmod)
     +	When trying to access a registered page, user is automatically redirected
     	there on successful login.
     #	Fixed various issues with system search (mainly related to stripslashes()
     #	Removed stripslashes() in many places in the code. Added check for
     	magic_quotes_gpc to new wb class method add_slashes(). Now database contest
     	is independent of magic_quotes setting..
 -Sep-2005 Stefan Braunewell
     #	Fixed bug concerning direct access of preferences page.
     #	Reworked page visibility and menu item visibility code (frontend login
     	problem).
     #	Pages in link list in htmlarea popup are now correctly ordered.
     #	Fixed bug where group with existing name can be added.
 -Sep-2005 Ryan Djurovich
     +	Added and RSS newsfeed script to the News module
 -Sep-2005 Stefan Braunewell
     !	Rewrote menu function. Parameters are now given as attributes to frontend class.
     #	Fixed some occurrences of potential direct access path disclosure
     #	Added directory check to browse.php to prevent xss exploit by trusted users.
     !	Updated code to reflect move to Subversion repository system.
 -Aug-2005 Stefan Braunewell
     #	Fixed bugs 4,5,6,8,9 in bug tracker
     !	Removed 'USER_LANGUAGE' and 'GET_LANGUAGE' constants.
     	A GET['lang'] now sets the session language variable.
 -Aug-2005 Stefan Braunewell
     !	Moved redundant code into the new class functions. Created
     	'compatibility.php' for backward compatibility with
     	modules and templates. Variables and functions can still be accessed
     	in the old way.
     !/+	Reorganized core frontend files, added new base class 'wb' from
     	which 'admin' and the new 'frontend' class inherit. Moved all frontend
     	function into new class. Completely rewrote core index.php.
     	Now all variables and functions that are available to templates and
     	modules are attributes and methods of the frontend and the wb classes
     ------------------------------------- 2.5.2 -------------------------------------
 -Jun-2005 Ryan Djurovich
     !	create_access_file now creates all parent directories if needed
     #	Fixed bug when moving page with subpages to another level
     #	Fixed bug when saving "Settings" (in Admin) on Windows/IIS
     #	Fixed bug where query was not setting error correctly in class.database.php
 -Jun-2005 Ryan Djurovich
     #	Fixed bug where template permissions were not saved when a adding group
 -Jun-2005 Ryan Djurovich
     #	Added htmlspecialchars for modifying WYSIWYG, news, etc. modules (Bug #78)
     #	Fixed language problems in some area's of Admin. (Bug #70)
     #	Added a space in website/page keywords (Bug #69)
     #	Fixed bugs on settings2.php (Bug #52)
     !	Links inserted with HTMLArea now use [wblink--PAGE_ID--] instead of raw URL
 -Jun-2005 Ryan Djurovich
     #	Fixed bug (#88) with news module
     !	Title of Administration login page now taken from language file (Bug #72)
     #	Fixed redirection admin/home to admin/start on admin/index.php
     #	Fixed bug with forgotten password page in admin (Bug #81)
 -Apr-2005 Ryan Djurovich
     #	Fixed numerous bugs with module uninstallation
     #	Fixed bug when uploading files in Administration -> Media
     !	Installer no-longer requires you to accept the GNU GPL
     ------------------------------------- 2.5.1 -------------------------------------
 -Apr-2005 Ryan Djurovich
     #	Fixed two bugs with account login/logout
     ------------------------------------- 2.5.1 -------------------------------------
 -Apr-2005 Ryan Djurovich
     #	Fixed bug where non-english characters can get used in page filenames. Many
     	measuers have been added (including a new file: wb/framework/convert.php),
     	to prevent any possible errors that can occur in page filenames.
     #	Fixed invalid meta tags in stock templates (meta tags were not closed)
     #	Removed lines 401, 402, and 425 of wb/index.php - not needed
     #	Fixed bug where search and account pages are shown in every block
     	that is in a template
     #	Fixed numerous bugs with media home directories feature
 -Apr-2005 Ryan Djurovich
     #	Fixed bugs in account/login.php and logout.php where users
     	gets redirected to /pages
     ------------------------------------- 2.5.0 -------------------------------------
 -Apr-2005 Ryan Djurovich
     -	Removed section language feature
     +	Added page language feature (replaces need for sections language feature)
     #	Fixed bug where pages using menu_link module can have the URL changed
     -	Page directory no longer stored in link field in pages table, it is now added
     	when the page_link function is called - this makes changing the pages
     	directory much easier and quicker
     !	Pages with visibility of "none" are now no longer directly accessable
     +	Added new visibility setting "hidden", acts exactly like none did previously
     !	Template info file can now specify number of menu's available and relative names
     !	Template info file can now specify number of blocks's available and relative names
     ------------------------------------- 2.4.3 -------------------------------------
 -Apr-2005 Ryan Djurovich
     #	page_filename function has been rewritten using str_replace
     	function, which should be faster and will allow characters
     	from other languages into filenames
     !	Created new media_filename function, which is now used
     	by all media functions (create,upload,rename) to determine
     	which characters should be removed from a desired filename
     +	New button in Administration page list to view specific page
     #	Updated the page_link function to now be compatible with menu link
     	module when setting pages directory to root
     #	Fixed bugs in search when using "Any Words" option
     #	Fixed bug with news module when pages directory set to root
     !	Changed URL of documentation website on Administration Start page
     ------------------------------------- 2.4.2 -------------------------------------
 -Apr-2005 Ryan Djurovich
     #	Fixed bug where file could be renamed to nothing in Media
     !	Optimised Media create folder, upload file, and rename functions
     #	Fixed bug where stripslashes not run on news post titles in admin
 -Apr-2005 Stefan Braunewell
     #	Fixed bug concerning usage of the private_sql variable
     #	Fixed bug conerning sub-pages being displayed in menus incorrectly
     ------------------------------------- 2.4.1 -------------------------------------
 -Apr-2005 Ryan Djurovich
     !	Pages with visibility of "none" are again directly accessable
     #	Fixed bugs regarding renaming files and directories in Media section
     !	When home folders disabled, all folders now visible in Media section
     ------------------------------------- 2.4.0 -------------------------------------
 -Apr-2005 Ryan Djurovich
     -	Removed recently added visibility setting of "heading", and relative config vars
     +	Added new "menu" field to pages table, and new setting "multiple menus"
     	which replaces the need for the menu headings feature
     +	Added links to top of groups and users sections, linking to each other
     !	Change menu width in "Round" template to 170px (was 150px)
     #	Change page "are you sure" deletion message to mention that it will delete
     	all sub-pages as well
     #	Fixed many bugs with news module when viewing posts by group
     !	Pages with visibility of "none" are now no longer directly accessable
 -Apr-2005 Ryan Djurovich
     -	Removed need to specify DB_URL when calling database class
     #	Stopped fields without a type specified from being shown in form mod
     #	Changed '/media' to MEDIA_DIRECTORY on HTMLArea popup windows
     	for insert link and insert image
     +	Added setting which allows you to specify the default WYSIWYG style
     +	Added "Server Email" option, to specify what is used in "From" field when
     	sending emails using the PHP mail function. Default is admins email address.
     #	Search now excludes pages which have a visibility of none or heading
     !	Pages are now given modified_when and modified_by when added
 -Apr-2005 Ryan Djurovich
     +	Added option to News module to specify how many posts should be listed
     	per page (by default it is set to unlimited, which functions like previous version)
     #	Added stripslashes when display page titles in search
     +	Page descriptions and last updated date now shown in search by default
 -Mar-2005 Ryan Djurovich
     +	Added new feature for Media home folders, where a folder can be specified
     	for a specific user or group of users only
     !	Changed URL of Help button to http://www.websitebaker.org/docs/
     +	Added new feature for "Page Trash" - two modes available: inline and separate
     !	When pages are deleted, all sub-pages are now deleted (instead of being moved
     	up a level)
 -Mar-2005 Ryan Djurovich
     -	Removed Database Settings from Administration Settings (options will not be
     	available in 3.x, so trying to match interface with WB 3.x plans
     !	Changed the name of Path Settings to Filesystem Settings in Administration
     	Settings, and removed ability to change path/url options - matching interface
     	plans for WB 3.x
     +	Added same options for OS and file permissions as installer to Settings
     !	Sessions now named with APP_NAME.'_session_id' (e.g. default is wb_session_id)
 -Mar-2005 Ryan Djurovich
     +	New functions available to templates to simplify creation of them. This aims
     	to "future-proof" templates for WB 3.x plans.
     !	Default templates updated to support some of the new functions
     +	Added field to pages table "page_trail" which stores a list of the pages
     	parents. This field was needed by the new page_menu function
     +	Added option for page visibility "heading" to enabled support for multiple
     	menu's. Also, this helps to "future-proof" templates for WB 3.x plans
     +	Added option for page visibility "registered", which acts a little like
     	private, but is still shown in the menu (although users need to log in to view
     	the pages content)
     +	Form module submissions now saved to database, and feature now added to
     	limit number of submissions per hour to prevent spamming
     +	New field for Form module: email. Allows you to specify their email in
     	"from" field on module settings.
     #	Fixed bug when displaying comments in News module (WB Bug #14)
     +	New "under contruction" message if no pages exist
     !	Cleaned-up wb/index.php
 -Mar-2005 Ryan Djurovich
     +	Created advanced mkdir and chmod functions
     #	Fixed bug in media where wrong file/folder is deleted
     +	Complete overhall of installer - now only one step! It has been greatly
     	simplified in many ways, has much better validation, reports error much more
     	nicely, and automatically logs the user into the Administrations
     +	Must now specify OS type - allows for customizable file permission settings
     +	Sections can now have a language code assigned to them
     +	Sections can now have a block name/id assigned to them
     !	Home section of Administration renamed to Start, to save confusion with saying
     	Homepage (because this term could either mean the main website or Home section
     	in	Administration). Also, this aims to unify the interface with WB 3.x plans
     !	Moved Users and Groups sections under Access section. This aims to unify the
     	interface with WB 3.x plans, which help to unclutter the menu
     !	Interface for Settings section has been imporved for usability purposes
     #	Fixed HTMLArea where no scrollbar for "insert link" and "insert image" dialogs
     	by placing media list inside an iframe
     #	Fixed stripslashes problem for viewing news comments
     !	Added code from Formesque module (an advanced version of the original Form
     	module, modified by Rudolph Lartey from www.carbonect.com), and made further
     	interface improvements for select box/checkbox group/radio group options.
     #	Possibly fixed bugs where an S appears before file and dir modes
     #	Fixed bug where users can be added with same emails (in Administration)
     -	Removed support for PEAR, as it was deemed an unnecessary addition which only
     	makes code more bulky, and removing it will decrease package size a lot
     +	New "homepage redirect" option so first page is included and not redirected to
     #	Fixed text not being shown when module uninstalled
     !	Imporved interface for basic group permissions
 -Mar-2005 Stefan Braunewell
     #	Fixed bug with front-end logins
     #	Fixed bug when saving intro page
     +	Added check on sign-up if e-mail exists (thanks to P. Melief)
     #	Fixed bugs concerning moving/deleting pages
     #	Fixed list of parents in page settings
     #	Fixed mkdir without mode parameter
     #	Added a check on install to ensure PHP 4.1.x compatibility (thanks to Wanderer)
     +	Added support for PAGES_DIRECTORY set to root
     +	Search form now supports quotes (thanks to Manafta)
     #	Fixed page section ordering
     #	News items are displayed with name of poster instead of "Unknown"
     #	Deletion confirmation popup window in media section now shows correct file name
     ------------------------------------- 2.3.1 -------------------------------------
 -Fed-2005 Ryan Djurovich
     +	Now there is two types of "filesystem modes", one for directories and one
     	for files. Having different settings is very common for most servers, so
     	this addition should fix many problems people had with 2.3.0.
     -	Removed filesystem mode options from installation
     !	Removed duplicate text on installation step 3 for timezone
     !	All "access files" for the news module now stored in pages/posts instead
     	of a sub-dir relative to the page (this fixes many bugs)
     #	Fixed major bugs when deleting pages with sub-pages
     !	Removed the restrictions that prevent a user for changing a pages level
     #	Fixed bug with "toggle" plus/minus in IE for pages list
     #	Fixed some bugs where /pages was not replaced with PAGES_DIRECTORY constant
     ------------------------------------- 2.3.0 -------------------------------------
 -Jan-2005 Ryan Djurovich
     #	Fixed bug in framework/functions.php that made root parent always equal 8
     #	Added missing braces in lines 182 and 208 of admin/pages/settings2.php
     #	Fixed SQL-query on line 172, placing a / after $old_link
     #	Added eregi checks for PAGES_DIRECTORY on lines 140 and 150 of
     	admin/pages/settings2.php
     #	Added ordering cleaning to delete_post.php on line 53 for news module
     !	GMT option is selected for "Default Timezone" in the installer, instead
     	of the old "Please select" message (which had the same value as GMT)
 -Jan-2005 Ryan Djurovich
     !	Ability to specify the chmod number when WB uploads files, etc.
     !	Modified file headers (copyright/license notice) so they now look almost the
     	same, independant of font. Also, it now covers copyright for 2005.
 -Jan-2005 Ryan Djurovich
     #	Added code on wb/admin/pages/delete.php to remove sections from the sections
     	table when a page is deleted.
     +	New 'Smart Login' prevents users from using external password managers,
     	and can be set to remember the users password using cookies.
     !	SourceForge CVS module now called websitebaker2 (instead of just
     	websitebaker). Also, all file versions have been reset.
 -Fed-2005 Ryan Djurovich
     !	Added code to prevent from changing a pages level (it simply disables
     	the select box), to prevent many possible bugs.
     ------------------------------------- 2.2.4 -------------------------------------
 -Dec-2004 Ryan Djurovich
     !	Change 'EXACT_PHRASE' to 'EXACT_MATCH' on line 261 of wb/languages/EN.php
     #	Fixed multi-language support in search
     +	Added more detailed options to list of PHP error reporting level's
     -	Removed ability to change language and PHP error reporting level
     	on installation to make things easier for newbie's
     +	Ability to select custom spacer for page filename's
     !	Changed the way a language code is found on language installation
     +	Added template permissions to groups
     #	Fixed bug when trying to change email from Preferences (admin and frontend)
     #	Fixed bug with auto-selection of "System Default" for Preferences
     !	News module now use's WYSIWYG for modifying news posts
     +	Ability to specify both the pages and media target directories
     ------------------------------------ 2.2.3-c ------------------------------------
 -Dec-2004 Ryan Djurovich
     #	Fixed problem with DB password being reset if Settings saved in basic mode
     ------------------------------------ 2.2.3-b ------------------------------------
 -Dec-2004 Ryan Djurovich
     #	Fixed minor bug on admin templates section
     #	Fixed bug on rename.php and rename2.php in admin media section
     ------------------------------------- 2.2.3 -------------------------------------
 -Dec-2004 Ryan Djurovich
     +	Added WB release version in Administration (top right corner)
     !	New option to prevent users from adding level 0 pages
     #	Fixed bug when deleting post's in News module
     +	Added new field in pages table for "root" parent (level 0 parent), for
     	extra flexability in creating templates
     !	Round template now supports unlimited page levels
     ------------------------------------- 2.2.2 -------------------------------------
 -Dec-2004 Ryan Djurovich
     +	New option under Search Settings for selecting custom template for search
     +	New option when changing page settings to set the target
     #	Fixed error when saving a user after editing
     !	Users can now modify sub-page if they dont have permissions on the parent
     ------------------------------------- 2.2.1 -------------------------------------
 -Dec-2004 Ryan Djurovich
     #	Fixed bug when changing password on preferences form (front-end)
     #	Fixed bug when retrieving user details (administration)
     #	Added check to see if module, template, or language is in use when deleting
     #	Fixed up email that is sent to user from a submitted form
     #	Fixed major problem with module permissions which stopped it from working
     ------------------------------------- 2.2.0 -------------------------------------
 -Dec-2004 (Correct date[s] unkown) Ryan Djurovich
     +	Multiple-level page support
     +	Multiple section's for pages (including interface)
     !	Removed text created using two words on all areas
     	(e.g. {Intro} {PAGE} is now {INTRO_PAGE})
     	this is for better language support
     +	Added Languages section
     !	Moved Templates and Modules under Add-ons section
     !	Changed name of "Default" template to "Round"
     +	Added "All CSS" template
     +	Added "Jump"
     +	Added
     !	Modified "Box" template to support multiple page levels
     +	Added "Menu Link" module
     +	Added "News" module
     +	Added "Code" module
     +	Added "Form" module
     +	Added "Wrapper" module
     !	Changed name of "Normal Page" module to "WYSIWYG"
     +	Created new admin wrapper script to ease module develpment
     +	Media now automatically creates index.php file for every
     	sub-folder made (for security purposes)
     !	Change "Help" link in Administration menu so it now directs
     	to the the new Website Baker documentation website found at:
     	http://www.websitebaker.org/documentation
     !	Password is now required to change email in preferences
     +	User can now select custom Language and Date & Time Formats
     +	Added search functionality, with three different "methods":
 . Using all words  2. Using any words  3. Exact match
     +	Added native MySQL database support

     <?php
     // $Id$
     /*
      Website Baker Project <http://www.websitebaker.org/>
      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
     */
     /*
     	This file is purely for ensuring compatibility with 3rd party
     	contributions made for WB version 2.5.2 or below
     */
     if(!defined('WB_URL')) {
     	header('Location: ../index.php');
     	exit(0);
+    }
     // references to objects and variables that changed their names
     $admin = &$wb;
     $default_link=&$wb->default_link;
     $page_trail=&$wb->page_trail;
     $page_description=&$wb->page_description;
     $page_keywords=&$wb->page_keywords;
     $page_link=&$wb->link;
     // extra_sql is not used anymore - this is basically a register_globals exploit prevention...
     $extra_sql=&$wb->extra_sql;
     $extra_where_sql=&$wb->extra_where_sql;
     $query="SELECT directory FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'snippet'";
     $query_result=$database->query($query);
     if ($query_result->numRows()>0) {
     	while ($row = $query_result->fetchRow()) {
     		$module_dir = $row['directory'];
     		if (file_exists(WB_PATH.'/modules/'.$module_dir.'/include.php')) {
     			include(WB_PATH.'/modules/'.$module_dir.'/include.php');
+    		}
+    	}
+    }
     // Frontend functions
     if (!function_exists('page_link')) {
     	function page_link($link) {
     		global $wb;
     		return $wb->page_link($link);
+    	}
+    }
     //function to highlight search results
     function search_highlight($foo='', $arr_string=array()) {
     	require_once(WB_PATH.'/framework/functions.php');
     	require(WB_PATH.'/search/search_convert.php');
     	$foo = entities_to_umlauts($foo, 'UTF-8');
     	array_walk($arr_string, create_function('&$v,$k','$v = preg_quote($v, \'/\');'));
     	$search_string = implode("|", $arr_string);
     	$string = entities_to_umlauts($search_string, 'UTF-8');
     	$string = strtr($string, $string_ul_umlauts);
     	// do some magic to prevent &lt; &gt; ... from being highlighted
     	$foo = strtr($foo, array("&lt;"=>"!,,!", "&gt;"=>"!,,,!", "&amp;"=>"!,,,,!", "&quot;"=>"!,,,,,!", "&#39;"=>"!,,,,,,!"));
     	$string = strtr($string, array("&lt;"=>"!,,!", "&gt;"=>"!,,,!", "&amp;"=>"!,,,,!", "&quot;"=>"!,,,,,!", "&#39;"=>"!,,,,,,!"));
     	$foo = preg_replace('/('.$string.')(?=[^>]*<)/iUS', '<span class="highlight">$1</span>',$foo);
     	$pos = strpos($foo, '<');
     	if ($pos === false) { // "===" means identicaly
     		$foo = preg_replace('/('.$string.')/i', '<span class="highlight">$1</span>',$foo);
+    	}
     	$foo = strtr($foo, array("!,,!"=>"&lt;", "!,,,!"=>"&gt;", "!,,,,!"=>"&amp;", "!,,,,,!"=>"&quot;", "!,,,,,,!"=>"&#39;"));
     	//$foo = umlauts_to_defcharset($foo, 'UTF-8');
     	if(DEFAULT_CHARSET != 'utf-8') {
     		$foo = umlauts_to_entities($foo, 'UTF-8');
+    	}
     	return $foo;
+    }
     // Old menu call invokes new menu function
     if (!function_exists('page_menu')) {
     	function page_menu($parent = 0, $menu_number = 1, $item_template = '<li[class]>[a] [menu_title] [/a]</li>', $menu_header = '<ul>', $menu_footer = '</ul>', $default_class = ' class="menu_default"', $current_class = ' class="menu_current"', $recurse = LEVEL) {
     		global $wb;
     		$wb->menu_number=$menu_number;
     		$wb->menu_item_template=$item_template;
     		$wb->menu_item_footer='';
     		$wb->menu_parent = $parent;
     		$wb->menu_header = $menu_header;
     		$wb->menu_footer = $menu_footer;
     		$wb->menu_default_class = $default_class;
     		$wb->menu_current_class = $current_class;
     		$wb->menu_recurse = $recurse+2;
     		$wb->menu();
     		unset($wb->menu_parent);
     		unset($wb->menu_number);
     		unset($wb->menu_item_template);
     		unset($wb->menu_item_footer);
     		unset($wb->menu_header);
     		unset($wb->menu_footer);
     		unset($wb->menu_default_class);
     		unset($wb->menu_current_class);
     		unset($wb->menu_start_level);
     		unset($wb->menu_collapse);
     		unset($wb->menu_recurse);
+    	}
+    }
     if (!function_exists('show_menu')) {
     	function show_menu($menu_number = NULL, $start_level=NULL, $recurse = NULL, $collapse = NULL, $item_template = NULL, $item_footer = NULL, $menu_header = NULL, $menu_footer = NULL, $default_class = NULL, $current_class = NULL, $parent = NULL) {
     		global $wb;
     		if (isset($menu_number))
     			$wb->menu_number=$menu_number;
     		if (isset($start_level))
     			$wb->menu_start_level=$start_level;
     		if (isset($recurse))
     			$wb->menu_recurse=$recurse;
     		if (isset($collapse))
     			$wb->menu_collapse=$collapse;
     		if (isset($item_template))
     			$wb->menu_item_template=$item_template;
     		if (isset($item_footer))
     			$wb->menu_item_footer=$item_footer;
     		if (isset($menu_header))
     			$wb->menu_header=$menu_header;
     		if (isset($menu_footer))
     			$wb->menu_footer=$menu_footer;
     		if (isset($default_class))
     			$wb->menu_default_class=$default_class;
     		if (isset($current_class))
     			$wb->menu_current_class=$current_class;
     		if (isset($parent))
     			$wb->menu_parent=$parent;
     		$wb->menu();
     		unset($wb->menu_recurse);
     		unset($wb->menu_parent);
     		unset($wb->menu_start_level);
+    	}
+    }
     if (!function_exists('page_content')) {
     	function page_content($block = 1) {
     		// Get outside objects
     		global $TEXT,$MENU,$HEADING,$MESSAGE;
     		global $globals;
     		global $database;
     		global $wb;
     		$admin = & $wb;
     		if ($wb->page_access_denied==true) {
     	        echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'];
     			exit();
+    		}
     		if(isset($globals) AND is_array($globals)) { foreach($globals AS $global_name) { global $$global_name; } }
     		// Make sure block is numeric
     		if(!is_numeric($block)) { $block = 1; }
     		// Include page content
     		if(!defined('PAGE_CONTENT') OR $block!=1) {
     			$page_id=$wb->page_id;
     			// First get all sections for this page
     			$query_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position");
     			// If none were found, check if default content is supposed to be shown
     			if($query_sections->numRows() == 0) {
     				if ($wb->default_block_content=='none') {
     					return;
+    				}
     				if (is_numeric($wb->default_block_content)) {
     					$page_id=$wb->default_block_content;
     				} else {
     					$page_id=$wb->default_page_id;
+    				}
     				$query_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position");
     				// Still no cotent found? Give it up, there's just nothing to show!
     				if($query_sections->numRows() == 0) {
     					return;
+    				}
+    			}
     			// Loop through them and include their module file
     			while($section = $query_sections->fetchRow()) {
     				$section_id = $section['section_id'];
     				$module = $section['module'];
     				// highlights searchresults
     				if (isset($_GET['searchresult']) AND is_numeric($_GET['searchresult']) ) {
     					if (isset($_GET['sstring']) AND !empty($_GET['sstring']) ){
     						$arr_string = explode(" ", $_GET['sstring']);
     						if($_GET['searchresult'] == 2) {
     							// exact match
     							$arr_string[0] = strtr($arr_string[0], "_"," ");
+    						}
     						ob_start(); //start output buffer
     						require(WB_PATH.'/modules/'.$module.'/view.php');
     						$foo = ob_get_contents();    // put outputbuffer in $foo
     						ob_end_clean();             // clear outputbuffer
     						echo search_highlight($foo, $arr_string);
+    					}
     				} else {
     					require(WB_PATH.'/modules/'.$module.'/view.php');
+    				}
+    			}
     		} else {
     			require(PAGE_CONTENT);
+    		}
+    	}
+    }
     if (!function_exists('show_content')) {
     	function show_content($block=1) {
     		page_content($block);
+    	}
+    }
     if (!function_exists('show_breadcrumbs')) {
     	function show_breadcrumbs($sep=' > ',$tier=1,$links=true,$depth=-1) {
     		global $wb;
     		$page_id=$wb->page_id;
     		if ($page_id!=0)
+    		{
     	 		global $database;
     			$bca=$wb->page_trail;
     			$counter=0;
     			foreach ($bca as $temp)
+    			{
     		        if ($counter>=($tier-1) AND ($depth<0 OR $tier+$depth>$counter))
+    		        {
     					if ($counter>=$tier) echo $sep;
     					$query_menu=$database->query("SELECT menu_title,link FROM ".TABLE_PREFIX."pages WHERE page_id=$temp");
     					$page=$query_menu->fetchRow();
     					if ($links==true AND $temp!=$page_id)
     						echo '<a href="'.page_link($page['link']).'">'.$page['menu_title'].'</a>';
     					else
     					    echo $page['menu_title'];
+    		        }
     	            $counter++;
+    			}
+    		}
+    	}
+    }
     // Function for page title
     if (!function_exists('page_title')) {
     	function page_title($spacer = ' - ', $template = '[WEBSITE_TITLE][SPACER][PAGE_TITLE]') {
     		$vars = array('[WEBSITE_TITLE]', '[PAGE_TITLE]', '[MENU_TITLE]', '[SPACER]');
     		$values = array(WEBSITE_TITLE, PAGE_TITLE, MENU_TITLE, $spacer);
     		echo str_replace($vars, $values, $template);
+    	}
+    }
     // Function for page description
     if (!function_exists('page_description')) {
     	function page_description() {
     		global $wb;
     		if ($wb->page_description!='') {
     			echo $wb->page_description;
     		} else {
     			echo WEBSITE_DESCRIPTION;
+    		}
+    	}
+    }
     // Function for page keywords
     if (!function_exists('page_keywords')) {
     	function page_keywords() {
     		global $wb;
     		if ($wb->page_keywords!='') {
     			echo $wb->page_keywords;
     		} else {
     			echo WEBSITE_KEYWORDS;
+    		}
+    	}
+    }
     // Function for page header
     if (!function_exists('page_header')) {
     	function page_header($date_format = 'Y') {
     		echo WEBSITE_HEADER;
+    	}
+    }
     // Function for page footer
     if (!function_exists('page_footer')) {
     	function page_footer($date_format = 'Y') {
     		global $starttime;
     		$vars = array('[YEAR]', '[PROCESS_TIME]');
     		$processtime=array_sum(explode(" ",microtime()))-$starttime;
     		$values = array(date($date_format),$processtime);
     		echo str_replace($vars, $values, WEBSITE_FOOTER);
+    	}
+    }
     // Function to add optional module Javascript or CSS stylesheets into the <head> section of the frontend
     if(!function_exists('register_frontend_modfiles')) {
     	function register_frontend_modfiles($file_id="css") {
     		// sanity check of parameter passed to the function
     		$file_id = strtolower($file_id);
     		if($file_id !== "css" && $file_id !== "javascript" && $file_id !== "js") {
     			return;
+    		}
     		global $wb, $database;
     		// define default baselink and filename for optional module javascript and stylesheet files
     		$head_links = "";
     		if($file_id == "css") {
           	$base_link = '<link href="'.WB_URL.'/modules/{MODULE_DIRECTORY}/frontend.css"';
     			$base_link.= 'rel="stylesheet" type="text/css" media="screen" />';
     			$base_file = "frontend.css";
     		} else {
     			$base_link = '<script type="text/javascript" src="'.WB_URL.'/modules/{MODULE_DIRECTORY}/frontend.js"></script>';
     			$base_file = "frontend.js";
+    		}
       		// gather information for all models embedded on actual page
     		$page_id = $wb->page_id;
         	$query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections
     			WHERE page_id=$page_id AND module<>'wysiwyg'");
         	while($row = $query_modules->fetchRow()) {
     			// check if page module directory contains a frontend.js or frontend.css file
           	if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) {
     				// create link with frontend.js or frontend.css source for the current module
     				$tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link);
             		// ensure that frontend.js or frontend.css is only added once per module type
             		if(strpos($head_links, $tmp_link) === false) {
     					$head_links .= $tmp_link ."\n";
+    				}
+    			}
+        	}
       		// write out links with all external module javascript/CSS files, remove last line feed
     		echo $head_links;
+    	}
+    }
     // Begin WB < 2.4.x template compatibility code
     	// Make extra_sql accessable through private_sql
     	$private_sql = $extra_sql;
     	$private_where_sql = $extra_where_sql;
     	// Query pages for menu
     	$menu1 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '0' AND $extra_where_sql ORDER BY position ASC");
     	// Check if current pages is a parent page and if we need its submenu
     	if(PARENT == 0) {
     		// Get the pages submenu
     		$menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PAGE_ID."' AND $extra_where_sql ORDER BY position ASC");
     	} else {
     		// Get the pages submenu
     		$menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PARENT."' AND $extra_where_sql ORDER BY position ASC");
+    	}
     // End WB < 2.4.x template compatibility code
     // Include template file
     ?>

     <?php
     // $Id$
     /*
      Website Baker Project <http://www.websitebaker.org/>
      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
     */
     /*
     Website Baker functions file
     This file contains general functions used in Website Baker
     */
     // Stop this file from being accessed directly
     if(!defined('WB_URL')) {
     	header('Location: ../index.php');
     	exit(0);
+    }
     // Define that this file has been loaded
     define('FUNCTIONS_FILE_LOADED', true);
     // Function to remove a non-empty directory
     function rm_full_dir($directory)
+    {
         // If suplied dirname is a file then unlink it
         if (is_file($directory)) {
             return unlink($directory);
+        }
         // Empty the folder
         $dir = dir($directory);
         while (false !== $entry = $dir->read()) {
             // Skip pointers
             if ($entry == '.' || $entry == '..') {
                 continue;
+            }
             // Deep delete directories
             if (is_dir("$directory/$entry")) {
                 rm_full_dir("$directory/$entry");
             } else {
                 unlink("$directory/$entry");
+            }
+        }
         // Now delete the folder
         $dir->close();
         return rmdir($directory);
+    }
     // Function to open a directory and add to a dir list
     function directory_list($directory) {
     	$list = array();
     	// Open the directory then loop through its contents
     	$dir = dir($directory);
     	while (false !== $entry = $dir->read()) {
     		// Skip pointers
     		if(substr($entry, 0, 1) == '.' || $entry == '.svn') {
     			continue;
+    		}
     		// Add dir and contents to list
     		if (is_dir("$directory/$entry")) {
     			$list = array_merge($list, directory_list("$directory/$entry"));
     			$list[] = "$directory/$entry";
+    		}
+    	}
     	// Now return the list
     	return $list;
+    }
     // Function to open a directory and add to a dir list
     function chmod_directory_contents($directory, $file_mode) {
     	// Set the umask to 0
     	$umask = umask(0);
     	// Open the directory then loop through its contents
     	$dir = dir($directory);
     	while (false !== $entry = $dir->read()) {
     		// Skip pointers
     		if(substr($entry, 0, 1) == '.' || $entry == '.svn') {
     			continue;
+    		}
     		// Chmod the sub-dirs contents
     		if(is_dir("$directory/$entry")) {
     			chmod_directory_contents("$directory/$entry", $file_mode);
+    		}
     		change_mode($directory.'/'.$entry, 'file');
+    	}
     	// Restore the umask
     	umask($umask);
+    }
     // Function to open a directory and add to a file list
     function file_list($directory, $skip = array()) {
     	$list = array();
     	$skip_file = false;
     	// Open the directory then loop through its contents
     	$dir = dir($directory);
     	while (false !== $entry = $dir->read()) {
     		// Skip pointers
     		if($entry == '.' || $entry == '..') {
     			$skip_file = true;
+    		}
     		// Check if we to skip anything else
     		if($skip != array()) {
     			foreach($skip AS $skip_name) {
     				if($entry == $skip_name) {
     					$skip_file = true;
+    				}
+    			}
+    		}
     		// Add dir and contents to list
     		if($skip_file != true AND is_file("$directory/$entry")) {
     			$list[] = "$directory/$entry";
+    		}
     		// Reset the skip file var
     		$skip_file = false;
+    	}
     	// Now delete the folder
     	return $list;
+    }
     // Function to get a list of home folders not to show
     function get_home_folders() {
     	global $database, $admin;
     	$home_folders = array();
     	// Only return home folders is this feature is enabled
     	// and user is not admin
     	if(HOME_FOLDERS AND ($_SESSION['GROUP_ID']!='1')) {
     		$query_home_folders = $database->query("SELECT home_folder FROM ".TABLE_PREFIX."users WHERE home_folder != '".$admin->get_home_folder()."'");
     		if($query_home_folders->numRows() > 0) {
     			while($folder = $query_home_folders->fetchRow()) {
     				$home_folders[$folder['home_folder']] = $folder['home_folder'];
+    			}
+    		}
     		function remove_home_subs($directory = '/', $home_folders) {
     			if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.$directory)) {
     				// Loop through the dirs to check the home folders sub-dirs are not shown
     			   while(false !== ($file = readdir($handle))) {
     					if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') {
     						if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) {
     							if($directory != '/') { $file = $directory.'/'.$file; } else { $file = '/'.$file; }
     							foreach($home_folders AS $hf) {
     								$hf_length = strlen($hf);
     								if($hf_length > 0) {
     									if(substr($file, 0, $hf_length+1) == $hf) {
     										$home_folders[$file] = $file;
+    									}
+    								}
+    							}
     							$home_folders = remove_home_subs($file, $home_folders);
+    						}
+    					}
+    				}
+    			}
     			return $home_folders;
+    		}
     		$home_folders = remove_home_subs('/', $home_folders);
+    	}
     	return $home_folders;
+    }
     // Function to create directories
     function make_dir($dir_name, $dir_mode = OCTAL_DIR_MODE) {
     	if(!file_exists($dir_name)) {
     		$umask = umask(0);
     		mkdir($dir_name, $dir_mode);
     		umask($umask);
     		return true;
     	} else {
     		return false;
+    	}
+    }
     // Function to chmod files and directories
     function change_mode($name) {
     	if(OPERATING_SYSTEM != 'windows') {
     		// Only chmod if os is not windows
     		if(is_dir($name)) {
     			$mode = OCTAL_DIR_MODE;
     		} else {
     			$mode = OCTAL_FILE_MODE;
+    		}
     		if(file_exists($name)) {
     			$umask = umask(0);
     			chmod($name, $mode);
     			umask($umask);
     			return true;
     		} else {
     			return false;
+    		}
     	} else {
     		return true;
+    	}
+    }
     // Function to figure out if a parent exists
     function is_parent($page_id) {
     	global $database;
     	// Get parent
     	$query = $database->query("SELECT parent FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'");
     	$fetch = $query->fetchRow();
     	// If parent isnt 0 return its ID
     	if($fetch['parent'] == '0') {
     		return false;
     	} else {
     		return $fetch['parent'];
+    	}
+    }
     // Function to work out level
     function level_count($page_id) {
     	global $database;
     	// Get page parent
     	$query_page = $database->query("SELECT parent FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id' LIMIT 1");
     	$fetch_page = $query_page->fetchRow();
     	$parent = $fetch_page['parent'];
     	if($parent > 0) {
     		// Get the level of the parent
     		$query_parent = $database->query("SELECT level FROM ".TABLE_PREFIX."pages WHERE page_id = '$parent' LIMIT 1");
     		$fetch_parent = $query_parent->fetchRow();
     		$level = $fetch_parent['level'];
     		return $level+1;
     	} else {
     		return 0;
+    	}
+    }
     // Function to work out root parent
     function root_parent($page_id) {
     	global $database;
     	// Get page details
     	$query_page = $database->query("SELECT parent,level FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id' LIMIT 1");
     	$fetch_page = $query_page->fetchRow();
     	$parent = $fetch_page['parent'];
     	$level = $fetch_page['level'];
     	if($level == 1) {
     		return $parent;
     	} elseif($parent == 0) {
     		return $page_id;
     	} else {
     		// Figure out what the root parents id is
     		$parent_ids = array_reverse(get_parent_ids($page_id));
     		return $parent_ids[0];
+    	}
+    }
     // Function to get page title
     function get_page_title($id) {
     	global $database;
     	// Get title
     	$query = $database->query("SELECT page_title FROM ".TABLE_PREFIX."pages WHERE page_id = '$id'");
     	$fetch = $query->fetchRow();
     	// Return title
     	return $fetch['page_title'];
+    }
     // Function to get a pages menu title
     function get_menu_title($id) {
     	// Connect to the database
     	$database = new database();
     	// Get title
     	$query = $database->query("SELECT menu_title FROM ".TABLE_PREFIX."pages WHERE page_id = '$id'");
     	$fetch = $query->fetchRow();
     	// Return title
     	return $fetch['menu_title'];
+    }
     // Function to get all parent page titles
     function get_parent_titles($parent_id) {
     	$titles[] = get_menu_title($parent_id);
     	if(is_parent($parent_id) != false) {
     		$parent_titles = get_parent_titles(is_parent($parent_id));
     		$titles = array_merge($titles, $parent_titles);
+    	}
     	return $titles;
+    }
     // Function to get all parent page id's
     function get_parent_ids($parent_id) {
     	$ids[] = $parent_id;
     	if(is_parent($parent_id) != false) {
     		$parent_ids = get_parent_ids(is_parent($parent_id));
     		$ids = array_merge($ids, $parent_ids);
+    	}
     	return $ids;
+    }
     // Function to genereate page trail
     function get_page_trail($page_id) {
     	return implode(',', array_reverse(get_parent_ids($page_id)));
+    }
     // Function to get all sub pages id's
     function get_subs($parent, $subs) {
     	// Connect to the database
     	$database = new database();
     	// Get id's
     	$query = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent'");
     	if($query->numRows() > 0) {
     		while($fetch = $query->fetchRow()) {
     			$subs[] = $fetch['page_id'];
     			// Get subs of this sub
     			$subs = get_subs($fetch['page_id'], $subs);
+    		}
+    	}
     	// Return subs array
     	return $subs;
+    }
     // Function as replacement for php's htmlspecialchars()
     function my_htmlspecialchars($string) {
     	$string = preg_replace("/&(?=[#a-z0-9]+;)/i", "_x_", $string);
     	$string = strtr($string, array("<"=>"&lt;", ">"=>"&gt;", "&"=>"&amp;", "\""=>"&quot;", "\'"=>"&#39;"));
     	$string = preg_replace("/_x_(?=[#a-z0-9]+;)/i", "&", $string);
     	return($string);
+    }
     // Function to convert a string from $from- to $to-encoding, using mysql
     function my_mysql_iconv($string, $from, $to) {
     	// keep current character set values
     	global $database;
     	$query = $database->query("SELECT @@character_set_client");
     	if($query->numRows() > 0) {
     		$res = $query->fetchRow();
     		$character_set_database = $res['@@character_set_client'];
     	}	else { echo mysql_error()."\n<br />"; }
     	$query = $database->query("SELECT @@character_set_results");
     	if($query->numRows() > 0) {
     		$res = $query->fetchRow();
     		$character_set_results = $res['@@character_set_results'];
     	}	else { echo mysql_error()."\n<br />"; }
     	$query = $database->query("SELECT @@collation_connection");
     	if($query->numRows() > 0) {
     		$res = $query->fetchRow();
     		$collation_results = $res['@@collation_connection'];
     	}	else { echo mysql_error()."\n<br />"; }
     	// set new character set values
     	$query = $database->query("SET character_set_client=$from");
     	$query = $database->query("SET character_set_results=$to");
     	$query = $database->query("SET collation_connection=utf8_unicode_ci");
     	$string_escaped = mysql_real_escape_string($string);
     	// convert the string
     	$query = $database->query("SELECT '$string_escaped'");
     	if($query->numRows() > 0) {
     		$res = $query->fetchRow();
     		$converted_string = $res[0];
     	}	else { echo mysql_error()."\n<br />"; }
     	// restore previous character set values
     	$query = $database->query("SET character_set_client=$character_set_database");
     	$query = $database->query("SET character_set_results=$character_set_results");
     	$query = $database->query("SET collation_connection=$collation_results");
     	return $converted_string;
+    }
     // Function as wrapper for mb_convert_encoding
     // converts $charset_in to $charset_out or
     // UTF-8 to HTML-ENTITIES or HTML-ENTITIES to UTF-8
     function mb_convert_encoding_wrapper($string, $charset_out, $charset_in) {
     	if ($charset_out == $charset_in) {
     		return $string;
+    	}
     	$use_iconv = true;
     	$use_mbstring = true;
     	/*
     	if(version_compare(PHP_VERSION, "5.1.0", "<")) {
     		$use_mbstring = false; // don't rely on mb_convert_encoding if php<5.1.0
     		$use_iconv = false; // don't rely on iconv neither
+    	}
     	*/
     	// try mb_convert_encoding(). This can handle to or from HTML-ENTITIES, too
     	if ($use_mbstring && function_exists('mb_convert_encoding')) {
     		// there's no GB2312 or ISO-8859-11 encoding in php's mb_* functions
     		if ($charset_in=='ISO-8859-11' || $charset_in=='GB2312') {
     			if ($use_iconv && function_exists('iconv')) {
     				$string = iconv($charset_in, 'UTF-8', $string);
+    			}
     			else {
     				if ($charset_in == 'GB2312') {
     					$string=my_mysql_iconv($string, 'gb2312', 'utf8');
     				} else {
     					$string=my_mysql_iconv($string, 'tis620', 'utf8');
+    				}
+    			}
     			$charset_in='UTF-8';
     			if ($charset_out == 'UTF-8') {
     				return $string;
+    			}
+    		}
     		if ($charset_out=='ISO-8859-11' || $charset_out=='GB2312') {
     			$string=mb_convert_encoding($string, 'UTF-8', $charset_in);
     			if ($use_iconv && function_exists('iconv')) {
     				$string = iconv('UTF-8', $charset_out, $string);
+    			}
     			else {
     				if ($charset_out == 'GB2312') {
     					$string=my_mysql_iconv($string, 'utf8', 'gb2312');
     				} else {
     					$string=my_mysql_iconv($string, 'utf8', 'tis620');
+    				}
+    			}
     		} else {
     			$string = strtr($string, array("&lt;"=>"&_lt;", "&gt;"=>"&_gt;", "&amp;"=>"&_amp;", "&quot;"=>"&_quot;", "&#39;"=>"&_#39;"));
     			$string=mb_convert_encoding($string, $charset_out, $charset_in);
     			$string = strtr($string, array("&_lt;"=>"&lt;", "&_gt;"=>"&gt;", "&_amp;"=>"&amp;", "&_quot;"=>"&quot;", "&_#39;"=>"&#39;"));
+    		}
     		return $string;
+    	}
     	// try iconv(). This can't handle to or from HTML-ENTITIES.
     	if ($use_iconv && function_exists('iconv') && $charset_out!='HTML-ENTITIES' && $charset_in!='HTML-ENTITIES' ) {
     		$string = iconv($charset_in, $charset_out, $string);
     		return $string;
+    	}
     	// do the UTF-8->HTML-ENTITIES or HTML-ENTITIES->UTF-8 translation if mb_convert_encoding isn't available
     	if (($charset_in=='HTML-ENTITIES' && $charset_out=='UTF-8') || ($charset_in=='UTF-8' && $charset_out=='HTML-ENTITIES')) {
     		$string = string_decode_encode_entities($string, $charset_out, $charset_in);
     		return $string;
+    	}
     	// mb_convert_encoding() and iconv() aren't available, so use my_mysql_iconv()
     	if ($charset_in == 'ISO-8859-1') { $mysqlcharset_from = 'latin1'; }
     	elseif ($charset_in == 'ISO-8859-2') { $mysqlcharset_from = 'latin2'; }
     	elseif ($charset_in == 'ISO-8859-3') { $mysqlcharset_from = 'latin1'; }
     	elseif ($charset_in == 'ISO-8859-4') { $mysqlcharset_from = 'latin7'; }
     	elseif ($charset_in == 'ISO-8859-5') { $string = convert_cyr_string ($string, "iso8859-5", "windows-1251" ); $mysqlcharset_from = 'cp1251'; }
     	elseif ($charset_in == 'ISO-8859-6') { $mysqlcharset_from = ''; } //?
     	elseif ($charset_in == 'ISO-8859-7') { $mysqlcharset_from = 'greek'; }
     	elseif ($charset_in == 'ISO-8859-8') { $mysqlcharset_from = 'hebrew'; }
     	elseif ($charset_in == 'ISO-8859-9') { $mysqlcharset_from = 'latin5'; }
     	elseif ($charset_in == 'ISO-8859-10') { $mysqlcharset_from = 'latin1'; }
     	elseif ($charset_in == 'BIG5') { $mysqlcharset_from = 'big5'; }
     	elseif ($charset_in == 'ISO-2022-JP') { $mysqlcharset_from = ''; } //?
     	elseif ($charset_in == 'ISO-2022-KR') { $mysqlcharset_from = ''; } //?
     	elseif ($charset_in == 'GB2312') { $mysqlcharset_from = 'gb2312'; }
     	elseif ($charset_in == 'ISO-8859-11') { $mysqlcharset_from = 'tis620'; }
     	elseif ($charset_in == 'UTF-8') { $mysqlcharset_from = 'utf8'; }
     	else { $mysqlcharset_from = 'latin1'; }
     	if ($charset_out == 'ISO-8859-1') { $mysqlcharset_to = 'latin1'; }
     	elseif ($charset_out == 'ISO-8859-2') { $mysqlcharset_to = 'latin2'; }
     	elseif ($charset_out == 'ISO-8859-3') { $mysqlcharset_to = 'latin1'; }
     	elseif ($charset_out == 'ISO-8859-4') { $mysqlcharset_to = 'latin7'; }
     	elseif ($charset_out == 'ISO-8859-5') { $mysqlcharset_to = 'cp1251'; } // use convert_cyr_string afterwards
     	elseif ($charset_out == 'ISO-8859-6') { $mysqlcharset_to = ''; } //?
     	elseif ($charset_out == 'ISO-8859-7') { $mysqlcharset_to = 'greek'; }
     	elseif ($charset_out == 'ISO-8859-8') { $mysqlcharset_to = 'hebrew'; }
     	elseif ($charset_out == 'ISO-8859-9') { $mysqlcharset_to = 'latin5'; }
     	elseif ($charset_out == 'ISO-8859-10') { $mysqlcharset_to = 'latin1'; }
     	elseif ($charset_out == 'BIG5') { $mysqlcharset_to = 'big5'; }
     	elseif ($charset_out == 'ISO-2022-JP') { $mysqlcharset_to = ''; } //?
     	elseif ($charset_out == 'ISO-2022-KR') { $mysqlcharset_to = ''; } //?
     	elseif ($charset_out == 'GB2312') { $mysqlcharset_to = 'gb2312'; }
     	elseif ($charset_out == 'ISO-8859-11') { $mysqlcharset_to = 'tis620'; }
     	elseif ($charset_out == 'UTF-8') { $mysqlcharset_to = 'utf8'; }
     	else { $mysqlcharset_to = 'latin1'; }
     	if ($mysqlcharset_from!="" && $mysqlcharset_to!="" && $mysqlcharset_from!=$mysqlcharset_to) {
     		$string=my_mysql_iconv($string, $mysqlcharset_from, $mysqlcharset_to);

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff

Project

General

Profile

WB 2.08.x

Revision 509

Added by ryan over 18 years ago