WB 2.08.x

Change Log

===============================================================================

Please note: This change log may not be accurate

$Id$

Legend:

+ = Added

- = Removed

# = Bugfix

! = Update/Change

#	Changes on module "code": add the section_id to the name of the textarea,

	to keep the functionality if you are using more than one code-section on a page.

!	Moving the html-template inside a "htt" folder and rename the suffix to ".htt" to

	keep it consitant to other modules. Minor cosmetic changes inside the code.

#	Fixed a bug in Menu_link module that made childpages of the menu_link page

	not selectable. (thnx to Luisehahne)

#	Fixed small bug introduced in changeset [999]

#	Fixed bug that parent pages didn't inherit language settings to kind pages

+	Add upgrade-script to droplets

!	Changes on upgrade-script to avoid droping droplet-modul-tables if the exists.

!	calling "upgrate.php" or "install.php" instead of hard-coded lines to avoid

+	Add "$wb->strip_slashes" again for backslashes are displayed in the output (view.php).

+	Add Droplets (Ruud)

+	modifications inside frontend.functions.php for backwart compatiblity (Ruud)

+	modifications inside the search to get the droplets seachable (Ruud)

+	Add additional constant to "install/save.php" to avoid conflikts during

+	Additional Errormessage if nessesary tables are not found (english).

13-June-2009 Matthias Gallas

!	Moved images in lQuery plugins folder (Thanks to Luisehahne)

#	fixed small german language issue in jscalendar (Thanks to Luisehahne)

+	Added jQuery(1.3.2) and jQueryUI(1.7.1) to WB core (ticket #708)

#	Fixed some strange backend layout issues (ticket #722)

+	Added index.php to all WB-Theme folders to prevent directory spoofing

	settings (ticket #714)

!	Updated Dutch language files for modules (Thanks to LuckyLuke)

#	Fixed bug with dropdownlist in pages settings (ticket #713)

!	Updated Dutch language file (Thanks to Luckyluke)

!	Added disclaimer to upgrade-script.php

-	removed unneeded stylesheet.css from account dir

+	added fixed error.htt also to classic theme

!	Changes in warning.htt templates to get valid XHTL1.1 output - replace the center-tag with div

#	add "AND section_id='$section_id'" to the delete-query to avoid conflicts if there are more

	than one Form on one single page.

	and replace the br-tag with valid p-tags.

+	added skinable Admin Interface

!	removed some comment lines (changes are tracked by SVN)

20-Feb-2009 Dietrich Roland Pehlke (aldus)

!	add additional tr and td tags to the text_no_results message to get valid XHMTL output

18-Feb-2009 Dietrich Roland Pehlke (aldus)

#	fixed: typos in the section_id inside the action-link

!	Remove test_trash and unused variables in query, added suggetions from #588

#	Bugfix for form bug (ticket #688)

+	added option to invoke module install.php from backend (for modules uploaded via FTP)

!	admin Add-on settings no hidden by default (can be set visible via advanced link)

!	redirect time for function print_success can now be defined in Settings (ticket #603)

+	added possibility to reload Add-ons via the Add-on section

+	added option to perform pre-installation checks to test requirements of Add-Ons

#	added error messages to installation process for Add-Ons with wrong file type

#	fixed warning if database connection failed during installation process

!	fixed some typos in German language file (thanks to freeSbee)

!	mail text for register, signup and forgot mail now taken from WB language file (ticket #684)

#	removed PHPMailer fix introduced with 2.0.3 to get SMTP working again (line 1041 in class.smtp.php)

#	Fixed bug wich causes that install of captcha-control may fail (ticket #682 thanks to thorn)

01-Feb-2009 Matthias Gallas

!	Update FCKEditor to version 2.6.4

!	Added default target attribut to backend menu links

!	Copyright notices now includes 2009

#	fixed form-module select (multiple) doesn't work (ticket #681 Thanks to thorn)

+	added Javascript syntax highlighting framework EditArea as replacement for Codepress

#	fixed error message in admin class if type array not defined

#	Code-Snippets are no longer shown as type: unknown.

+	Additional key in the languagefiles "$TEXT['CODE_SNIPPET']";

#	fixed bug for the rss of news, see ticket #609

#	made news Modul multilingual, see ticket #676 (some additional translations are needed)

!	modul_uninstall: added language variable $TEXT['FILE'] instead of "Datei"

+	add language support for the errormessages inside the uninstall.php files for modules

	and templates.

!	add new keys inside the german de.php language-file.

-	removed my own debugging-code (was in 893 by mistake)

!	Correct the last date in the changelog

29-Dec-2008 Matthias Gallas

#	replaced in news modul special chars with entities to get valid output

!	changed SESSION ID Separator from '&' to '&' to get valid output

-	Removed the <p> tag around the news as it is added from the editor

+	ticket 610: add ip-address to the email-body in the form-modul.

+	ticket 607: include the frontend.css in the comment_page.php file of the news-module.

#	File: admin/admintools/index.php - add "order by name" to the query to display the admintools in alphabetic order.

#	File: admin/modules/uninstall.php - remove a db-query to a db-field that doesn't exists in wb 2.7 anymore

#	fixed two issues with searchresult-highlighting: do not highlight in <pre>/<code>-tags, do not convert &lt; to &amp;lt; anymore.

!	changed mailer to not extract line break of alternative body text (thanks to freeSbee)

!	updated output filter regex to exclude mail addresses contained in input fields

27-Nov-2008 Thomas Hornik

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

22-Nov-2008 Thomas Hornik

!	search: replaced most of $string_ul_umlauts (from search_convert.php) through use of preg's u-switch.

02-Nov-2008 Thomas Hornik

!	news: added PAGE_SPACER to $page_title (creates e.g. title-32.php instead of title32.php)

01-Nov-2008 Thomas Hornik

!	improved ext_charset to work with latin1,cp1252,cp1251,latin2,hebrew,greek,latin5,latin7,utf8

+	added config for section anchor. ATTN: add "INSERT INTO TABLE_PREFIX.'settings' (name,value,extra) VALUES ('sec_anchor', 'wb_', '')" to upgrade-script.

!	updated menulink and search to use configureable section-anchor

29-Oct-2008 Thomas Hornik

# News: total number of news wasn't calculated correctly

!	Captcha: removed IFRAME for Calculation-as-text captcha

-	removed useless init_utf8funcs()-function

+	search: added search_lang for use in search-form. Using DE, the search will search ä=ae,... (alternate spelling of german umlauts)

-	search: removed undocumented word-boundary search

!	search: search_path is now anchored to the beginning of link ("link LIKE '$path%'" instead of "link LIKE '%$path%'")

!	updated basic templates according the template guidelines

24-Oct-2008 Dietrich Roland Pehlke

#	applied bugfix for ticket #608 (redeclaration of news module)

23-Oct-2008 Dietrich Roland Pehlke

!	modified module delete function to provide additional information when module is in use when trying to delete

!	modified template delete function to provide additional information when template is in when trying to delete

21-Oct-2008 Matthias Gallas

18-Sep-2008 Thomas Hornik

+	Added captcha-reload

16-Sep-2008 Thomas Hornik

#	search: fixed windows-related regex issue

19-Aug-2008 Matthias Gallas

02-Aug-2008 Thomas Hornik

!	added $database = new Database(); in front of output-filter

!	updated to latest FCKEditor version 2.6.2

01-Jul-2008 Thomas Hornik

#	page-names with doubled (or more) points can not be handled if php runs as cgi. Thanks to forum member hgi2001.

!	applied additional mail check to forgot login form

!	class and id attributes in mailto links are no longer ignored by the output filter

22-Jun-2008 Thomas Hornik

#	fixed issue with captcha (mt_rand() instead of rand())

#	fixed bug in search (link to http://.../search/index.php performs a search with string 'unset')

!	added output of block number to section admin if no block name is specified

!	updated show_menu2 to version 4.60 (to avoid disappearing menus)

#	hebrew-table in charsets-table.php was faultily imported - fixed. Thanks to forum-member iti.

#	fixed file-naming issue when old page-names (from before 2.7) contains "&"

26-Apr-2008 Thomas Hornik

#	fixed validiation bug in option fields of form modul

21-Apr-2008 Christian Sommer

20-Apr-2008 Thomas Hornik

#	fix: allow external urls for search-results

17-Apr-2008 Thomas Hornik

#	fixed possible clashes with intro page feature and WB core file /pages/index.php

15-Apr-2008 Thomas Hornik

#	fixed bug introduced with Changeset 826

14-Apr-2008 Thomas Hornik

#	fixed issue with multigroups (level 0 page-creation)

13-Apr-2008 Thomas Hornik

!	ASP: off per default. CAPTCHA: removed unneeded $admin. Filename: just convert chars like quote, doublequote, < > & to empty string.

!	fixed WB-Link Plugin to work with WB versions below 2.7 ($admin->page_is_visible() only available in WB 2.7)

09-Apr-2008 Christian Sommer

#	fixed error in german laguage file

07-Apr-2008 Thomas Hornik

!	added missing group_id in INSERT-query

!	removed PHP5 function stripos from installation script

05-Apr-2008 Matthias Gallas

!	Moved language variables for edit module CSS from modules language files to core language files

+	Added norwegian translation (Thanks OEH)

05-Apr-2008 Thomas Hornik

!	some small fixes: group_id/groups_id-handling, safe_mode-query in install, better work-around for issue with phplib and code-module (removed {})

#	fixed viewing_groups-handling in /admin/pages/add.php

!	imported new russian translation from User shlack. Many Thanks

05-Apr-2008 Christian Sommer

!	added workaround for template parser class

!	moved functions to edit module CSS files into the WB core to avoid duplication of code

!	minor layout change

!	allowed the character "-" to be used in database names

04-Apr-2008 Thomas Hornik

#	fixed: Language-redirect removed query-string from URL

04-Apr-2008 Christian Sommer

!	set WB version to 2.7 (RC3) for the next upcoming release candidate

03-Apr-2008 Christian Sommer

!	some code clean up in news/form module

!	small adaption of the edit CSS function file css.functions.php

!	updated edit module CSS functions to include backend.css into head if possible

#	fixed bug in Javascript decryption routines of the Output-Filter module

02-Apr-2008 Matthias Gallas

#	fixed bug with registration of users are not added to signup group

02-Apr-2008 Christian Sommer

#	added handling of missing characters to mailto encryption routines

!	some code clean-up in News module

!	fixed some layout issues with Form module (combination with Output-filter)

!	fixed layout issue with optional subject/body text of encrypted mailto links

#	fixed bug in the mailto Javascript encryption code of the Output-Filter module

01-Apr-2008 Christian Sommer

!	removed typo in English language file

!	added updated edit CSS functions to the News module

!	added updated edit CSS functions to the Form module

31-Mar-2008 Christian Sommer

#	fixed bug in output filter (mailto links with HTML entities in optional part)

29-Mar-2008 Christian Sommer

!	added missing translation to Dutch language file (thanks Bramus)

28-Mar-2008 Thomas Hornik

!	Some cleanup in search.php

!	WYSIWYG: changed field text to LONGTEXT, too.

25-Mar-2008 Matthias Gallas

!	Updated Dutch language file (Thanks to Bramus)

26-Mar-2008 Tomas Hornik

#	fixed E_NOTICE-message in admin/modules/details.php

25-Mar-2008 Thomas Hornik

+	search: added search_time_limit in settings (mainly for sites with PHP < 4.3.3 and slow search)

+	search: added missing code to allow query of external data and to process the search data itself

25-Mar-2008 Matthias Gallas

#	Fixed missing <body> tag in Admin Interface (ticket #572)

24-Mar-2008 Matthias Gallas

!	Updated Danish Language file (Thanks to Achrist)

! 	Added class nixhier to frontend.css from form and news Modul (required for ASP)

24-Mar-2008 Thomas Hornik

+	Added RU-language-files, provided by user shlack; converted to entities.

#	search: great speed-up with large pages - requires PHP >= 4.3.3; small speed-up for PHP < 4.3.3

#	FCK-Editor: loads large pages faster

-	removed include/captcha/asp.php. css have to be added to module's css-files.

23-Mar-2008 Matthias Gallas

! 	Updated form modul for valid output, removed all javascript (Big thanks to BerndJM)

17-Mar-2008 Thomas Hornik

#	fixed an issue with utf8_check() (too slow with many ~100KB pages)

15-Mar-2008 Thomas Hornik

#	menulink: link can be menulink or subpage of menulink, too

#	call_captcha: added parameter 'style', fixed some issue with parameter 'image' and text-style captchas

13-Mar-2008 Christian Sommer

! 	adjusted error/warning templates to the updated backend layout

13-Mar-2008 Matthias Gallas

! 	replaced one icon in admin interface

12-Mar-2008 Matthias Gallas

# 	fixed loading time and some display issues in IE6 of the new admin interface

!	tweaked the new admin interface a little bit

12-Mar-2008 Christian Sommer

! 	adjusted background color of installation and upgrade script

! 	set version number to 2.7 (RC2) for the upcoming second release candidate

! 	removed hardcoded /admin folder strings from WB core files where possible

! 	added WB home folder fix proposed by the forum member spawnferkel (thanks)

! 	defined <strong> and <em> instead of <b> and <i> as default tags

12-Mar-2008 Thomas Hornik

+	CAPTCHA: added parameter to call_captcha (can be one of: 'image', 'input' or 'text')

11-Mar-2008 Christian Sommer

#	fixed issue with output filter (all .@ in descriptive mailto part: >xxxxx</a> were replaced; now restricted to emails)

#	fixed issue with WYSIWYG pages (appears if backend language and page frontend language differs)

08-Mar-2008 Thomas Hornik

#	fixed issue with news and end-date

04-Mar-2008 Christian Sommer

#	fixed issue with smart view URL link

03-Mar-2008 Thomas Hornik

#	fixed an issue with text-captcha (default text got saved). Changes default text.

#	fixed an issue with highlighting

02-Mar-2008 Thomas Hornik

#	added missing text in language-files

+	added missing sorting to language dropdown in admin/pages/settings.php

01-Mar-2008 Thomas Hornik

#	fixed ticket #562, applied changes from user tavitar with some own additions

+	added check for AddDefaultCharset to install

29-Feb-2008 Thomas Hornik

#	fixed issue in pagename generation if AddDefaultCharset is set (as work-around).

28-Feb-2008 Thomas Hornik

#	fixed hebrew transliteration-table. Thanks to forum-member iti.

28-Feb-2008	Christian Sommer

#	added bugfix from the forum member tavitar to fix an issue with multiple groups (module permission do not add up properly)

25-Feb-2008	Matthias Gallas

+	added missing Dutch language files for core modules

24-Feb-2008 Thomas Hornik

#	issue with menulink in upgrade-script. Fixed.

23-Feb-2008 Christian Sommer

!	suppressed warnings in initialize.php if constant already defined; modified upgrade script to make FCK the new default editor

#	fixed bug in upgrade script (WBMailer setting)

22-Feb-2008 Christian Sommer

#	some layout changes on the upgrade-script, fixed error in precheck

#	restricted database name and table prefix to "a-zA-Z0-9_" (avoid problems with non quoted table/field names)

20-Feb-2008 Thomas Hornik

!	added workaround for language sorting-problem

20-Feb-2008	Christian Sommer

!	added WYSIWYG DB update and missing WBMAILER settings to upgrade script (added some status messages)

!	modified upgrade script and suppressed headers already send message (avoid issues with error reporting E_ALL)

#	added the FCKEditor module PHP connector fix found by the forum member Luisehahne (thanks man)

!	Updated upgrade script (added WB2.7 basic styles, pre-checks and disclaimer)

19-Feb-2008	Matthias Gallas

!	Updated upgrade script

!	Changed language sorting from directory to name (needs additional to be escaped!)

+	added new languages to install script

#	fixed some issues and typos in languagefiles

18-Feb-2008 Thomas Hornik

+	Converted and added some old language-files (BG, CS, PL, RU)

18-Feb-2008	Christian Sommer

#	Fixed two broken links

!	Modified news module to create a default index.php during installation (directory spoofing)

17-Feb-2008	Matthias Gallas

-	Removed colloquially german language files as the filename causes issues

17-Feb-2008	Christian Sommer

!	removed German Umlauts in some language file (PHP comments)

#	fixed language bug (backend language switched to the pages language viewed in frontend)

16-Feb-2008	Thomas Hornik

!	updated upgrade-script (menulink)

13-Feb-2008 Thomas Hornik

+	allow externl links in menulink-module

#	fixed an highlighting-issue: highlighting a page with more than one sections mangled umlauts in the second to last section.

10-Feb-2008 Matthias Gallas

#	fixed some errors in standard german language file

+	added new colloquially german language file

10-Feb-2008 Thomas Hornik

#	CAPTCHA: Wrong text for calc_ttf-captcha.

10-Feb-2008 Christian Sommer

#	fixed E_NOTICE warning with already defined module frontend constants

-	removed all stuff other than page_content from the blank template

!	adapted color for onmouseover effect

!	added disclaimer to the upgrade-script as the script is not sufficiently tested yet

!	made Website Header field in Settings visible per default

!	modified all templates (display Website Header, use show_menu instead of page_menu)

!	added highlighting of active input elements to all WB backend areas; changed some colors

!	removed hover highlighting of input fields to avoid possible confusion

!	added visualization of wrong/empty input fields

#	fixed a bug with re-enter admin password

09-Feb-2008 Christian Sommer

!	modified some colors and CSS definitions of pages, media and section interface

#	output_filter: fixed bug in regular expression (eats up characters in mailto links)

#	output_filter: removed word boundary from mailto regex part

#	fixed bug in menu_link module (IE 7 did not show the select boxes at all)

#	fixed bug in user signup

!	output_filter: added word boundary for the mailto regex part

09-Feb-2008 Thomas Hornwik

!	jsadmin: added latest changes from swen, fixes most (or all?) issues.

08-Feb-2008 Matthias Gallas

+	added kewyword id to all new files

08-Feb-2008 Christian Sommer

-	Removed admin module mail_filter

+	Added revised version of the output filter module

08-Feb-2008 Thomas Hornik

!	module news: set focus on captcha-field if user have to re-enter captcha

!	Changed maxlength of captcha-fields - don't tell the bots how many chars we want to have.

-	Removed unused function is_access_denied() from search

04-Feb-2008 Thomas Hornik

!	email-addresses are excluded from search-results page.

#	Fixed possible XSS in account/login.php and forgot-form.php

04-Feb-2008 Christian Sommer

#	allowed usage of tags in settings fields: website_header, website_footer

03-Feb-2008 Thomas Hornik

#	out-of-date default page isn't shown anymore, instead shows next public page.

#	fck_wbmodules.php: foreign privates pages in dropdown, fixed.

03-Feb-2008 Matthias Gallas

+	added kewyword id to all new files

02-Feb-2008 Christian Sommer

#	fixed wrong redirect in /admin/images

02-Feb-2008 Thomas Hornik

!	search shows email-addresses, even if email-filter is activated (on page with highlighting). Fixed.

+	Added missing text in languages files for jscalendar

!	settings: pages-directory '/' will be converted to '' (empty string) on save.

!	changed last remaining call to my_htmlspecialchars() to htmlspecialchars()

#	fixed path in jscalendar-css

01-Feb-2008 Christian Sommer

#	Added default index.php to all folders (directory spoofing)

01-Feb-2008 Thomas Hornik

#	Added some missing add_slashes(), get_post_escaped(), and strip_tags() for $_POST, $_GET and $_REQUEST-data. Also for $_SERVER['PHP_SELF'].

#	Fixed possible XSS-vulnerability in wb/search/search.php

31-Jan-2008 Thomas Hornik

!	Adjusted clock-red icon to match wb colors

#	admin/pages: the parent dropdown-list in index.php and settings.php showed foreign private pages, too. Fixed.

+	Added multi-group to upgrade-script

30-Jan-2008 Christian Sommer

#	fixed bug with text Captcha (input was restricted to 10 chars.) and a small layout issue

30-Jan-2008 Thomas Hornik

#	registered pages didn't appear in menu. fixed.

!	Updated upgrade-script. (Some upgrades still missing)

29-Jan-2008 Thomas Hornik

#	strtotime()'s behavior differ in PHP4 and PHP5.

	Had to fix some issues in admin/pages/sections and module news.

#	Security bugfix: Text file for text-captcha was world-readable. Moved to database.

#	Text-captcha: empty line in text file, following a question, was accepted as answer. Fixed.

28-Jan-2008 Matthias Gallas

#	Replaced all special chars in language files with htmlentities or unicode

+	Added some missing lines in language files

+	Added missing keyword Id

28-Jan-2008 Christian Sommer

#	fixed issue with top bar icon alt tag

!	added some more backend layout modifications

!	corrected bug in NL.php language file

!	added missing session cookie forgotten in Changeset 593

!	added possibility to select the default backend language during installation process

!	Re-introduced Changeset 593 (filename in pages/ from page_title instead of menu_title)

#	Fixed some bugs in the Javascript Admin modul

28-Jan-2008 Thomas Hornik

+	Allow a user-supplied From-Name in form-settings for email und success-email.

!	changeset 627: menu_link and search/search.php needs some minor changes, too.

+	Added Text-CAPTCHA on request. The captcha-text will be stored in temp/.captcha_text.txt

27-Jan-2008 Christian Sommer

!	fixed CSS background color of the installer CSS

!	replaced static text with variable text from language file

!	introduced the WB 2.7 backend style developed by Michael Brinsteiner (escpro), thanks man

!	added missing ID tags

27-Jan-2008 Christian Sommer

!	added missing ID tags

!	added default language for users to avoid empty language fields

27-Jan-2008 Matthias Gallas

+	added kewyword id to new file

#	Fixed some spelling errors in german language file

27-Jan-2008 Thomas Hornik

!	Module form: user supplied input isn't lost on captcha-failure anymore.

#	fixed 100%-cpu-load-event in CAPTCHA admin-tool.

+	Added Calc_ttf_image CAPTCHA.

!	Changed captcha/captcha.php to use table-layout for CAPTCHA.

!	Some minor changes in CAPTCHA-code.

!	Added some text to CAPTCHA admin-tool.

#	Module form: dropdown "success page" listed foreign private pages, too. Fixed.

+	Added preview-images for CAPTCHA.

!	Improved security: CAPTCHAS can't be loaded from outside WB

!	CAPTCHA ttf_image: added variant. Adjusted character-pool and one background for better readability.

26-Jan-2008 Christian Sommer

!	changed WYSIWYG content field from text to longtext (allows more than 65'534 characters)

+	Added Javascript Admin module (developed by Stepan Riha, adapted for WB2.7 by Swen Uth)

26-Jan-2008 Matthias Gallas

#	fixed bug in Javascript Admin module

+	Added new language files

+	Added keywords to files where they are missing

26-Jan-2008 Thomas Hornik

!	fixed some issues with CAPTCHA and ASP. Adjusted baseline of '*' in supplyed fonts to meet

	baseline of numbers. Added counter to ttf_image generation-loop. Removed now unneeded GD-lib verification.

	Improved ASP in news-module.

+	module news: added publish_until field to control the visibility of a news-posting by date and time

!	added strongly "condensed" fonts with many intersections for ttf-CAPTCHA as default fonts.

	It should be very difficult for spam-bots to recognize intersected characters.

25-Jan-2008 Christian Sommer

!	removed changes introduced with changeset 593 (we need to think off if we want to implement that feature)

25-Jan-2008 Thomas Hornik

+	Added new CAPTCHA. Adapted core: signup and modules: news and form.

+	Added Advanced Spam Protection (ASP) to core: signup and modules news and form.

#	module news: it was possible to post comments to postings with commenting disabled

	or to inactive postings. Fixed

24-Jan-2008 Thomas Hornik

!	Generate filename in pages/ from page_title instead of menu_title.

24-Jan-2008 Christian Sommer

#	fixed bug in Codepress integration (if codepress framework not installed)

+	added language support to all integrated modules (except for news and form module)

#	fixed another E_NOTICE warning

24-Jan-2008 Matthias Gallas

+	Added keywords to files where they are missing

23-Jan-2008 Christian Sommer

+	Added German language file for WB 2.7

22-Jan-2008 Christian Sommer

+	Added language support for the Admin tools (backup, reload, mail_filter)

-	Removed all admin tool text outputs from global language file to module language files

!	Introduced language support for the overview page of the Admin tools

+	Added function get_variable_content to allow extraction of variable content without including files

!	Changed language support for Addons -> Moduls -> Details

22-Jan-2008 Matthias Gallas

+	Added keywords to new mail filter files

22-Jan-2008 Thomas Hornik

+	manage-sections: changed calendar-icon to clock-icon, added second icon to empty date-field.

21-Jan-2008 Christian Sommer

!	Removed the manage section icon from the page admin (sections managed by publish by date function)

#	Fixed bug with the edit module CSS file implementation (IE7, Opera)

21-Jan-2008 Thomas Hornik

+	Unique session-identifier for each website baker installation. fixes #354

20-Jan-2008 Christian Sommer

#	fixed E_NOTICE-warning in save.php when input data was wrong

+	added the new admin tool email output filter which allows to transform

	emails before displaying them on the frontend

20-Jan-2008 Thomas Hornik

!	upgrade-script.php: fixed mysql_error() handling

!	upgrade-script.php: added code to update menu_links

#	fixed a typo in upgrade-script.php

!	updated admin/pages/sections.php to changed jscalendar-api from changeset 571

!	module menu_link: after adding a menu_link, the anchor dropdown shows "#"; fixed

#	fixed E_NOTICE-warning in news-module (about SECTION_ID in comment.php)

19-Jan-2008 Christian Sommer

!	Reduced the success time out and set WYSIWSY background to white

#	Fixed some errors in form module (only in conjunction with E_ALL)

!	Added support to configure the mailer settings via the backend

19-Jan-2008 Matthias Gallas

#	Fixed bug in news modul with missing variable PAGE_DIRECTORY

+	Added keywords to new files

19-Jan-2008 Thomas Hornik

-	Module news: removed old calendar

+	Module news: adapted news to use the new include/jscalendar

+	added installation-instructions to include/jscalendar

#	Module code: curly backets get deleted by pparse() from phplib. fixed

+	Module menu_link: added dropdown-listbox to select anchor

!	upgrade-script: added code to convert old menu_links to new ones (partly)

18-Jan-2008 Matthias Gallas

!	Updated news modul with features from the advanced news modul

!	Updated form modul with features from the advanced form modul

#	Fixed hardcoded /pages issue in intro page feature

+	Added example .htaccess to parse .html files, fixed bug in changeset 555

!	Revoked parts of changeset 547 and again introduced changeset 540

+	Added keywords to modules/fckeditor and all other new files

18-Jan-2008 Thomas Hornik

#	fixed two E_NOTICE-warnings in admin/pages/index.php

+	added new module-based search-function

+	added new publish-by-date code

17-Jan-2008 Christian Sommer

#	fixed bug in frontend login and multiple groups (only in conjunction with E_ALL)

!	removed the PAGE_EXTENSION from frontend login

17-Jan-2008 Matthias Gallas

#	Reintroduced changes from changeset 520 and 540 wich where overwritten

	by changeset 546

#	Revoked changeset 541 end removed all PAGE_EXTENSION variables and the related

	option in WB settings as this function only works on Apache Servers

	together with .htaccess and mod_rewrite

+	Added keywords to file menu_link/uninstall.php and new admintools files

17-Jan-2008 Christian Sommer

!	added the "users in multiple groups" feature (closes parts of ticket #546)

16-Jan-2008 Thomas Hornik

!	changed admin/pages/save.php to allow hidden config-elements in table search.

!	changed module menu_link: added table mod_menu_link, fixed page-deleting-bug,

	fixed odd behavior in case of menu_link as default-page.

#	changing PHP-error-level within website baker does not work - fixed (fixed ticket 532)

14-Jan-2008 Matthias Gallas

#	Replaced hardcoded .php with the variable PAGE_EXTENSION for the use in pagenames.

	(!!Attention!! To get extenions other than .php working additional fixes are necessary!)

#	Replaced the variable PAGE_EXTENSION with hardcoded .php on all places where the

	pathes points to WB Corefiles with the page extension .php

#	Replaced hardcoded text in login.php with language variables (fixes ticket 386)

14-Jan-2008 Christian Sommer

!	added a missing </tr> tag

#	re-introduced bugfix of Changeset 472 (fixes ticket 402) accidentally

	removed by Changeset 529 (enhanced pages admin)

13-Jan-2008 Christian Sommer

#	moved administration tools from Settings to the new section Admin-Tools

#	this bugfix closes the ticket 529 (WB upgrades modules with identical version)

!	increased redirection time after success message, corrected HOME link of the login panel

!	updated PHPMailer framework to version 2.0.0 (/include/phpmailer)

#	this bugfix closes ticket 412 (direct call of admin/settings/save.php clears database)

#	fixed error with redirection to admin panel after installation

12-Jan-2008 Christian Sommer

!	introduced smart URL detection for the 'View' menu in the WB backend

	(if page_id is set, redirect to this page instead of the root)

!	introduced the enhanced pages admin dialogue (thanks to icouto)

11-Jan-2008 Christian Sommer

+	added the FCKEditor module files missing in Changeset 527 (/modules/fckeditor)

-	removed the hmtlarea files in /modules/htmlarea

!	set the fckeditor as the new default editor /install/save.php

!	Updated function: register_frontend_modfiles in /framework/frontend.functions.php

	(added constants MOD_FRONTEND_CSS_REGISTERED, MOD_FRONTEND_JAVASCRIPT_REGISTERED)

11-Jan-2008 Matthias Gallas

!	Update codepress to Version 0.9.6

!	Update phplib to Version 7.4a

09-Jan-2008 Matthias Gallas

!	Upgrade pclzip to the newer more php5 complaint version 2.6, see ticket #526

#	Fixed ticket #542 (Thanks to Thorn)

23-Dec-2007 Matthias Gallas

!	Changed all copyright notices to include now 2008

21-Sep-2007 Matthias Gallas

#	Fixed a typo in /framework/frontend.functions.php cause that websites using

	the new register_frontend_modifles() functions do not validate

24-Jan-2007 Christian Sommer

!	Replaced some core files to allow configuration of wbmailer via admin settings panel

------------------------------------- 2.6.7 -------------------------------------

02-Jan-2007 Christian Sommer

+	Added missing converting file for changeset [504]

------------------------------------- 2.6.6 -------------------------------------

01-Jul-2007 Matthias Gallas

#	Fixed converting issue with some ISO-charsets and speeded up converting on large pages (thanks to Thorn)

01-Jul-2007 Ryan Djurovich

#	Fixed bug where error message not displayed when script fails to create a page

#	Fixed bugs introduced in [484]

14-May-2007 Matthias Gallas

+	Added support for ISO-8859-6.(Thanks to thorn)

12-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

08-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

30-Apr-2007 Matthias Gallas

#	Fixed ticket #392; root_parent not being set correctly (Thanks to eggsurplus)

10-Apr-2007 Matthias Gallas

+	Optimized search and highlighting funktions (Thanks to thorn)

03-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)

01-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.

12-Mar-2007 Matthias Gallas

+	Added multilingual support to search

03-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")

22-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)

16-Feb-2007 Christian Sommer

!	Suppressed PHP warnings and errors when reading empty intro.php

16-Feb-2007 Christian Sommer

#	Applied fix to enable parsing of PHP code in the intro.php

12-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

12-Feb-2007 Christian Sommer

!	Security enhancement (reduced number of login trials from 50 to 3)

02-Feb-2007 Matthias Gallas

#	Applied fix for ticket #380 (Thanks to pcwacht)

30-Jan-2007 Ryan Djurovich

#	Applied fix for ticket #376

29-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.

21-Jan-2007 Matthias Gallas

#	Fixed issue in the search table entries of form modul

13-Jan-2007 Matthias Gallas

#	Fixed some bugs in rss.php

07-Jan-2007 Matthias Gallas

#	Fixed error when uninstalling the news modul

02-Jan-2007 Matthias Gallas

+   Added id keywords to all missing files

#	Fixed issue with Permissions for pages sections

27-Dec-2006 Matthias Gallas

#	Fixed form modul stores empty records

------------------------------------- 2.6.5 -------------------------------------

25-Dec-2006 Ryan Djurovich

!	Changed links to WB help website

24-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

23-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)

21-Dec-2006 Matthias Gallas

#	Fixed missing message when adding a site without page title (#300)

21-Dec-2006 Ryan Djurovich

#	Fixed bug with captcha script (#346)

20-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)

26-Nov-2006 Ryan Djurovich

+	Added new script that could possibly be apart of 2.7.x as a replacement

	for having the pages directory

17-Nov-2006 Matthias Gallas

#	Fixed fatal error in line 46 news/comment.php (thanks to eki)(#358)

15-Nov-2006 Matthias Gallas

#	Fixed again intropage doesn't work (#71)

20-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 -------------------------------------

20-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)

19-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)

15-May-2006 Stefan Braunewell

#	Fixed security issues (#237)

03-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 -------------------------------------

19-Mar-2006 Stefan Braunewell

#	Fixed ticket #146: problems removing groups from viewers list of a page

16-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

01-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 -------------------------------------

03-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 -------------------------------------

12-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 -------------------------------------

28-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

27-Nov-2005 Ryan Djurovich

+	Added captcha verification to sign-up form

+	Added Captcha to News module

24-Nov-2005 Stefan Braunewell

!	Applied aportale's patch to use label instead of javascript toggle code

20-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)

29-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.

19-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

15-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.

11-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.

09-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..

05-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.

04-Sep-2005 Ryan Djurovich

+	Added and RSS newsfeed script to the News module

04-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.

27-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.

26-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 -------------------------------------

23-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

22-Jun-2005 Ryan Djurovich

#	Fixed bug where template permissions were not saved when a adding group

21-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

13-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)

25-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 -------------------------------------

16-Apr-2005 Ryan Djurovich

#	Fixed two bugs with account login/logout

------------------------------------- 2.5.1 -------------------------------------

15-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

10-Apr-2005 Ryan Djurovich

#	Fixed bugs in account/login.php and logout.php where users

	gets redirected to /pages

------------------------------------- 2.5.0 -------------------------------------

08-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 -------------------------------------

07-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 -------------------------------------

05-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

05-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 -------------------------------------